Fix cursor initialization, scope IDs

[openldap] / servers / slapd / module.c

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 6fa4ad38ab0b49737d111033e860ad53a1224a81..d6e1a4b392308b5f07cf8e2ca33a5f97b7d7c4ea 100644 (file)
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -29,7 +29,7 @@ struct module_regtable_t {
 
 typedef struct module_loaded_t {
        struct module_loaded_t *next;
-       lt_dlhandle *lib;
+       lt_dlhandle lib;
 } module_loaded_t;
 
 module_loaded_t *module_list = NULL;
@@ -41,8 +41,8 @@ int module_init (void)
        if (lt_dlinit()) {
                const char *error = lt_dlerror();
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-                           "module_init: lt_ldinit failed: %s\n", error ));
+               LDAP_LOG( SLAPD, CRIT, 
+                       "module_init: lt_ldinit failed: %s\n", error, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
 #endif
@@ -62,8 +62,8 @@ int module_kill (void)
        if (lt_dlexit()) {
                const char *error = lt_dlerror();
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-                           "module_kill: lt_dlexit failed: %s\n", error ));
+               LDAP_LOG( SLAPD, CRIT, "module_kill: lt_dlexit failed: %s\n", 
+                       error, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ANY, "lt_dlexit failed: %s\n", error, 0, 0);
 #endif
@@ -83,8 +83,8 @@ int module_load(const char* file_name, int argc, char *argv[])
        module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
        if (module == NULL) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-                       "module_load:  (%s) out of memory.\n", file_name ));
+               LDAP_LOG( SLAPD, CRIT, 
+                       "module_load:  (%s) out of memory.\n", file_name, 0, 0 );
 #else
                Debug(LDAP_DEBUG_ANY, "module_load failed: (%s) out of memory\n", file_name,
                        0, 0);
@@ -101,9 +101,9 @@ int module_load(const char* file_name, int argc, char *argv[])
        if ((module->lib = lt_dlopen(file_name)) == NULL) {
                error = lt_dlerror();
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
-                           "module_load: lt_dlopen failed: (%s) %s.\n",
-                           file_name, error ));
+               LDAP_LOG( SLAPD, CRIT, 
+                       "module_load: lt_dlopen failed: (%s) %s.\n", 
+                       file_name, error, 0 );
 #else
                Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name,
                        error, 0);
@@ -114,8 +114,7 @@ int module_load(const char* file_name, int argc, char *argv[])
        }
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "module", LDAP_LEVEL_INFO,
-                   "module_load: loaded module %s\n", file_name ));
+       LDAP_LOG( SLAPD, INFO, "module_load: loaded module %s\n", file_name, 0, 0 );
 #else
        Debug(LDAP_DEBUG_CONFIG, "loaded module %s\n", file_name, 0, 0);
 #endif
@@ -123,9 +122,9 @@ int module_load(const char* file_name, int argc, char *argv[])
    
        if ((initialize = lt_dlsym(module->lib, "init_module")) == NULL) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-                       "module_load: module %s : no init_module() function found\n",
-                       file_name ));
+               LDAP_LOG( SLAPD, ERR, 
+                       "module_load: module %s : no init_module() function found\n",
+                   file_name, 0, 0 );
 #else
                Debug(LDAP_DEBUG_CONFIG, "module %s: no init_module() function found\n",
                        file_name, 0, 0);
@@ -154,8 +153,8 @@ int module_load(const char* file_name, int argc, char *argv[])
        rc = initialize(argc, argv);
        if (rc == -1) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-                       "module_load:  module %s init_module() failed\n", file_name));
+               LDAP_LOG( SLAPD, ERR, 
+                       "module_load:  module %s init_module() failed\n", file_name, 0, 0);
 #else
                Debug(LDAP_DEBUG_CONFIG, "module %s: init_module() failed\n",
                        file_name, 0, 0);
@@ -166,12 +165,13 @@ int module_load(const char* file_name, int argc, char *argv[])
                return rc;
        }
 
-       if (rc >= (sizeof(module_regtable) / sizeof(struct module_regtable_t))
+       if (rc >= (int)(sizeof(module_regtable) / sizeof(struct module_regtable_t))
                || module_regtable[rc].proc == NULL)
        {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-                       "module_load: module %s: unknown registration type (%d).\n", file_name));
+               LDAP_LOG( SLAPD, ERR, 
+                       "module_load: module %s: unknown registration type (%d).\n", 
+                       file_name, rc, 0);
 #else
                Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
                        file_name, rc, 0);
@@ -184,9 +184,9 @@ int module_load(const char* file_name, int argc, char *argv[])
        rc = (module_regtable[rc].proc)(module, file_name);
        if (rc != 0) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "module", LDAP_LEVEL_ERR,
-                       "module_load: module %s:%s could not be registered.\n",
-                       file_name, module_regtable[rc].type ));
+               LDAP_LOG( SLAPD, ERR, 
+                       "module_load: module %s:%s could not be registered.\n",
+                       file_name, module_regtable[rc].type, 0 );
 #else
                Debug(LDAP_DEBUG_CONFIG, "module %s: %s module could not be registered\n",
                        file_name, module_regtable[rc].type, 0);
@@ -200,9 +200,9 @@ int module_load(const char* file_name, int argc, char *argv[])
        module_list = module;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "module", LDAP_LEVEL_INFO,
-                   "module_load: module %s:%s registered\n", file_name,
-                   module_regtable[rc].type ));
+       LDAP_LOG( SLAPD, INFO, 
+               "module_load: module %s:%s registered\n", file_name,
+               module_regtable[rc].type, 0 );
 #else
        Debug(LDAP_DEBUG_CONFIG, "module %s: %s module registered\n",
                file_name, module_regtable[rc].type, 0);
@@ -242,7 +242,7 @@ static int module_unload (module_loaded_t *module)
                }
 
                /* call module's terminate routine, if present */
-               if (terminate = lt_dlsym(module->lib, "term_module")) {
+               if ((terminate = lt_dlsym(module->lib, "term_module"))) {
                        terminate();
                }
 
@@ -265,12 +265,12 @@ load_extop_module (
        const char *file_name
 )
 {
-       SLAP_EXTOP_MAIN_FN ext_main;
-       int (*ext_getoid)(int index, char *oid, int blen);
-       char *oid;
+       SLAP_EXTOP_MAIN_FN *ext_main;
+       SLAP_EXTOP_GETOID_FN *ext_getoid;
+       struct berval oid;
        int rc;
 
-       ext_main = (SLAP_EXTOP_MAIN_FN)module_resolve(module, "ext_main");
+       ext_main = (SLAP_EXTOP_MAIN_FN *)module_resolve(module, "ext_main");
        if (ext_main == NULL) {
                return(-1);
        }
@@ -280,19 +280,15 @@ load_extop_module (
                return(-1);
        }
 
-       oid = ch_malloc(256);
-       rc = (ext_getoid)(0, oid, 256);
+       rc = (ext_getoid)(0, &oid, 256);
        if (rc != 0) {
-               ch_free(oid);
                return(rc);
        }
-       if (*oid == 0) {
-               free(oid);
+       if (oid.bv_val == NULL || oid.bv_len == 0) {
                return(-1);
        }
 
-       rc = load_extop( oid, ext_main );
-       free(oid);
+       rc = load_extop( &oid, ext_main );
        return rc;
 }
 #endif /* SLAPD_EXTERNAL_EXTENSIONS */