X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodule.c;h=b9e3ff5a6ce32592c1ad8d1ff6ca60f46eea4d07;hb=e720c15c4d82d975bf9ce6e7e3a347264d8b0d8d;hp=4559be0e0cf556c6b4b240de504e9a2a75544fbd;hpb=454284f1eae31da23440f6b6606c76ebbeb8ccfe;p=openldap
diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 4559be0e0c..b9e3ff5a6c 100644
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -1,4 +1,18 @@
/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
+ */
+
#include "portable.h"
#include
#include "slap.h"
@@ -29,18 +43,28 @@ 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;
static int module_unload (module_loaded_t *module);
+#ifdef HAVE_EBCDIC
+static char ebuf[BUFSIZ];
+#endif
+
int module_init (void)
{
if (lt_dlinit()) {
const char *error = lt_dlerror();
+#ifdef HAVE_EBCDIC
+ strcpy( ebuf, error );
+ __etoa( ebuf );
+ error = ebuf;
+#endif
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
+
return -1;
}
return 0;
@@ -55,7 +79,13 @@ int module_kill (void)
if (lt_dlexit()) {
const char *error = lt_dlerror();
+#ifdef HAVE_EBCDIC
+ strcpy( ebuf, error );
+ __etoa( ebuf );
+ error = ebuf;
+#endif
Debug(LDAP_DEBUG_ANY, "lt_dlexit failed: %s\n", error, 0, 0);
+
return -1;
}
return 0;
@@ -67,32 +97,56 @@ int module_load(const char* file_name, int argc, char *argv[])
const char *error;
int rc;
MODULE_INIT_FN initialize;
+#ifdef HAVE_EBCDIC
+#define file ebuf
+#else
+#define file file_name
+#endif
module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
if (module == NULL) {
Debug(LDAP_DEBUG_ANY, "module_load failed: (%s) out of memory\n", file_name,
0, 0);
+
return -1;
}
+#ifdef HAVE_EBCDIC
+ strcpy( file, file_name );
+ __atoe( file );
+#endif
/*
* The result of lt_dlerror(), when called, must be cached prior
* to calling Debug. This is because Debug is a macro that expands
* into multiple function calls.
*/
- if ((module->lib = lt_dlopen(file_name)) == NULL) {
+ if ((module->lib = lt_dlopenext(file)) == NULL) {
error = lt_dlerror();
- Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name,
+#ifdef HAVE_EBCDIC
+ strcpy( ebuf, error );
+ __etoa( ebuf );
+ error = ebuf;
+#endif
+ Debug(LDAP_DEBUG_ANY, "lt_dlopenext failed: (%s) %s\n", file_name,
error, 0);
+
ch_free(module);
return -1;
}
Debug(LDAP_DEBUG_CONFIG, "loaded module %s\n", file_name, 0, 0);
+
+#ifdef HAVE_EBCDIC
+#pragma convlit(suspend)
+#endif
if ((initialize = lt_dlsym(module->lib, "init_module")) == NULL) {
+#ifdef HAVE_EBCDIC
+#pragma convlit(resume)
+#endif
Debug(LDAP_DEBUG_CONFIG, "module %s: no init_module() function found\n",
file_name, 0, 0);
+
lt_dlclose(module->lib);
ch_free(module);
return -1;
@@ -117,16 +171,18 @@ int module_load(const char* file_name, int argc, char *argv[])
if (rc == -1) {
Debug(LDAP_DEBUG_CONFIG, "module %s: init_module() failed\n",
file_name, 0, 0);
+
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)
{
Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
file_name, rc, 0);
+
module_unload(module);
return -1;
}
@@ -135,6 +191,7 @@ int module_load(const char* file_name, int argc, char *argv[])
if (rc != 0) {
Debug(LDAP_DEBUG_CONFIG, "module %s: %s module could not be registered\n",
file_name, module_regtable[rc].type, 0);
+
module_unload(module);
return rc;
}
@@ -144,16 +201,27 @@ int module_load(const char* file_name, int argc, char *argv[])
Debug(LDAP_DEBUG_CONFIG, "module %s: %s module registered\n",
file_name, module_regtable[rc].type, 0);
+
return 0;
}
int module_path(const char *path)
{
+#ifdef HAVE_EBCDIC
+ strcpy(ebuf, path);
+ __atoe(ebuf);
+ path = ebuf;
+#endif
return lt_dlsetsearchpath( path );
}
void *module_resolve (const void *module, const char *name)
{
+#ifdef HAVE_EBCDIC
+ strcpy(ebuf, name);
+ __atoe(ebuf);
+ name = ebuf;
+#endif
if (module == NULL || name == NULL)
return(NULL);
return(lt_dlsym(((module_loaded_t *)module)->lib, name));
@@ -178,7 +246,13 @@ static int module_unload (module_loaded_t *module)
}
/* call module's terminate routine, if present */
- if (terminate = lt_dlsym(module->lib, "term_module")) {
+#ifdef HAVE_EBCDIC
+#pragma convlit(suspend)
+#endif
+ if ((terminate = lt_dlsym(module->lib, "term_module"))) {
+#ifdef HAVE_EBCDIC
+#pragma convlit(resume)
+#endif
terminate();
}
@@ -201,12 +275,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);
}
@@ -216,19 +290,17 @@ 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);
+ /* FIXME: this is broken, and no longer needed,
+ * as a module can call load_extop() itself... */
+ rc = load_extop( &oid, ext_main );
return rc;
}
#endif /* SLAPD_EXTERNAL_EXTENSIONS */