Fix ITS#1991 - referrals with sarch base == target (wasn't sure at first,

[openldap] / servers / slapd / module.c

diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 71d93a300fa65d8987286b60c8b713b3921a58b1..12375773cfae4fcb4a7ca8871a0f8d43b7382f39 100644 (file)
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -7,34 +7,46 @@
 
 #include <ltdl.h>
 
-int load_null (const void *module, const char *file_name);
-int load_extension (const void *module, const char *file_name);
+typedef int (*MODULE_INIT_FN)(
+       int argc,
+       char *argv[]);
+typedef int (*MODULE_LOAD_FN)(
+       const void *module,
+       const char *filename);
+typedef int (*MODULE_TERM_FN)(void);
+
 
 struct module_regtable_t {
        char *type;
-       int (*proc)(const void *module, const char *file_name);
+       MODULE_LOAD_FN proc;
 } module_regtable[] = {
-                                                       { "null", load_null },
+               { "null", load_null_module },
 #ifdef SLAPD_EXTERNAL_EXTENSIONS
-                                                       { "extension", load_extension },
+               { "extension", load_extop_module },
 #endif
-                                                       { NULL, NULL }
-                                               };
+               { NULL, NULL }
+};
 
 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;
 
-int module_unload (module_loaded_t *module);
+static int module_unload (module_loaded_t *module);
 
 int module_init (void)
 {
        if (lt_dlinit()) {
                const char *error = lt_dlerror();
+#ifdef NEW_LOGGING
+               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
+
                return -1;
        }
        return 0;
@@ -49,7 +61,13 @@ int module_kill (void)
 
        if (lt_dlexit()) {
                const char *error = lt_dlerror();
+#ifdef NEW_LOGGING
+               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
+
                return -1;
        }
        return 0;
@@ -60,12 +78,18 @@ int module_load(const char* file_name, int argc, char *argv[])
        module_loaded_t *module = NULL;
        const char *error;
        int rc;
-       int (*initialize) LDAP_P((int argc, char *argv[]));
+       MODULE_INIT_FN initialize;
 
        module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
        if (module == NULL) {
+#ifdef NEW_LOGGING
+               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);
+#endif
+
                return -1;
        }
 
@@ -76,17 +100,36 @@ 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( 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);
+#endif
+
                ch_free(module);
                return -1;
        }
 
+#ifdef NEW_LOGGING
+       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
+
    
        if ((initialize = lt_dlsym(module->lib, "init_module")) == NULL) {
+#ifdef NEW_LOGGING
+               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);
+#endif
+
                lt_dlclose(module->lib);
                ch_free(module);
                return -1;
@@ -109,26 +152,46 @@ int module_load(const char* file_name, int argc, char *argv[])
         */
        rc = initialize(argc, argv);
        if (rc == -1) {
+#ifdef NEW_LOGGING
+               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);
+#endif
+
                lt_dlclose(module->lib);
                ch_free(module);
                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( SLAPD, ERR, 
+                       "module_load: module %s: unknown registration type (%d).\n", 
+                       file_name, 0);
+#else
                Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
                        file_name, rc, 0);
+#endif
+
                module_unload(module);
                return -1;
        }
 
        rc = (module_regtable[rc].proc)(module, file_name);
        if (rc != 0) {
+#ifdef NEW_LOGGING
+               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);
+#endif
+
                module_unload(module);
                return rc;
        }
@@ -136,8 +199,15 @@ int module_load(const char* file_name, int argc, char *argv[])
        module->next = module_list;
        module_list = module;
 
+#ifdef NEW_LOGGING
+       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);
+#endif
+
        return 0;
 }
 
@@ -153,10 +223,10 @@ void *module_resolve (const void *module, const char *name)
        return(lt_dlsym(((module_loaded_t *)module)->lib, name));
 }
 
-int module_unload (module_loaded_t *module)
+static int module_unload (module_loaded_t *module)
 {
        module_loaded_t *mod;
-       int (*terminate) LDAP_P((void));
+       MODULE_TERM_FN terminate;
 
        if (module != NULL) {
                /* remove module from tracking list */
@@ -183,10 +253,48 @@ int module_unload (module_loaded_t *module)
        return 0;
 }
 
-int load_null (const void *module, const char *file_name)
+int load_null_module (const void *module, const char *file_name)
 {
        return 0;
 }
 
+#ifdef SLAPD_EXTERNAL_EXTENSIONS
+int
+load_extop_module (
+       const void *module,
+       const char *file_name
+)
+{
+       SLAP_EXTOP_MAIN_FN *ext_main;
+       int (*ext_getoid)(int index, char *oid, int blen);
+       char *oid;
+       int rc;
+
+       ext_main = (SLAP_EXTOP_MAIN_FN *)module_resolve(module, "ext_main");
+       if (ext_main == NULL) {
+               return(-1);
+       }
+
+       ext_getoid = module_resolve(module, "ext_getoid");
+       if (ext_getoid == NULL) {
+               return(-1);
+       }
+
+       oid = ch_malloc(256);
+       rc = (ext_getoid)(0, oid, 256);
+       if (rc != 0) {
+               ch_free(oid);
+               return(rc);
+       }
+       if (*oid == 0) {
+               free(oid);
+               return(-1);
+       }
+
+       rc = load_extop( oid, ext_main );
+       free(oid);
+       return rc;
+}
+#endif /* SLAPD_EXTERNAL_EXTENSIONS */
 #endif /* SLAPD_MODULES */