/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
+
#include "portable.h"
#include <stdio.h>
#include "slap.h"
__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;
}
__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;
}
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;
}
* to calling Debug. This is because Debug is a macro that expands
* into multiple function calls.
*/
- if ((module->lib = lt_dlopen(file)) == NULL) {
+ if ((module->lib = lt_dlopenext(file)) == NULL) {
error = lt_dlerror();
#ifdef HAVE_EBCDIC
strcpy( ebuf, error );
__etoa( ebuf );
error = ebuf;
#endif
-#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,
+ 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);
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;
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(-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;
}