/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
typedef struct module_loaded_t {
struct module_loaded_t *next;
lt_dlhandle lib;
+ char name[1];
} module_loaded_t;
module_loaded_t *module_list = NULL;
-static int module_unload (module_loaded_t *module);
+static int module_int_unload (module_loaded_t *module);
#ifdef HAVE_EBCDIC
static char ebuf[BUFSIZ];
__etoa( ebuf );
error = ebuf;
#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( SLAPD, CRIT,
- "module_init: lt_dlinit failed: %s\n", error, 0, 0 );
-#else
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
-#endif
return -1;
}
- return 0;
+
+ return module_path( LDAP_MODULEDIR );
}
int module_kill (void)
{
/* unload all modules before shutdown */
while (module_list != NULL) {
- module_unload(module_list);
+ module_int_unload(module_list);
}
if (lt_dlexit()) {
__etoa( ebuf );
error = ebuf;
#endif
-#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;
}
+void * module_handle( const char *file_name )
+{
+ module_loaded_t *module;
+
+ for ( module = module_list; module; module= module->next ) {
+ if ( !strcmp( module->name, file_name )) {
+ return module;
+ }
+ }
+ return NULL;
+}
+
+int module_unload( const char *file_name )
+{
+ module_loaded_t *module;
+
+ module = module_handle( file_name );
+ if ( module ) {
+ module_int_unload( module );
+ return 0;
+ }
+ return -1; /* not found */
+}
+
int module_load(const char* file_name, int argc, char *argv[])
{
- module_loaded_t *module = NULL;
+ module_loaded_t *module;
const char *error;
int rc;
MODULE_INIT_FN initialize;
#define file file_name
#endif
- module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
+ module = module_handle( file_name );
+ if ( module ) {
+ Debug( LDAP_DEBUG_ANY, "module_load: (%s) already loaded\n",
+ file_name, 0, 0 );
+ return -1;
+ }
+
+ /* If loading a backend, see if we already have it */
+ if ( !strncasecmp( file_name, "back_", 5 )) {
+ char *name = (char *)file_name + 5;
+ char *dot = strchr( name, '.');
+ if (dot) *dot = '\0';
+ rc = backend_info( name ) != NULL;
+ if (dot) *dot = '.';
+ if ( rc ) {
+ Debug( LDAP_DEBUG_CONFIG, "module_load: (%s) already present (static)\n",
+ file_name, 0, 0 );
+ return 0;
+ }
+ } else {
+ /* check for overlays too */
+ char *dot = strchr( file_name, '.' );
+ if ( dot ) *dot = '\0';
+ rc = overlay_find( file_name ) != NULL;
+ if ( dot ) *dot = '.';
+ if ( rc ) {
+ Debug( LDAP_DEBUG_CONFIG, "module_load: (%s) already present (static)\n",
+ file_name, 0, 0 );
+ return 0;
+ }
+ }
+
+ module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t) +
+ strlen(file_name));
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;
}
+ strcpy( module->name, file_name );
#ifdef HAVE_EBCDIC
strcpy( file, file_name );
__etoa( ebuf );
error = ebuf;
#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( SLAPD, CRIT,
- "module_load: lt_dlopenext failed: (%s) %s.\n",
- file_name, error, 0 );
-#else
Debug(LDAP_DEBUG_ANY, "lt_dlopenext 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
#ifdef HAVE_EBCDIC
#ifdef HAVE_EBCDIC
#pragma convlit(resume)
#endif
-#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);
*/
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);
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, rc, 0);
-#else
Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
file_name, rc, 0);
-#endif
- module_unload(module);
+ module_int_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);
+ module_int_unload(module);
return rc;
}
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;
}
return(lt_dlsym(((module_loaded_t *)module)->lib, name));
}
-static int module_unload (module_loaded_t *module)
+static int module_int_unload (module_loaded_t *module)
{
module_loaded_t *mod;
MODULE_TERM_FN terminate;
return(-1);
}
+ /* FIXME: this is broken, and no longer needed,
+ * as a module can call load_extop() itself... */
rc = load_extop( &oid, ext_main );
return rc;
}
projects / openldap / blobdiff