mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in reporting errors from ltdl library.

Browse Source
This commit is contained in:
Howard Chu 1999-09-28 09:54:00 +00:00
parent e7e4800d44
commit d08ac44eef
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
servers/slapd/module.c
View File

@ -7,18 +7,29 @@
#include <ltdl.h> #include <ltdl.h>
int module_load(const char* file_name, int argc, char *argv[]) { int module_load(const char* file_name, int argc, char *argv[])
{
lt_dlhandle* module = NULL; lt_dlhandle* module = NULL;
const char *error;
/*
* 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.
*/
int (*initialize) LDAP_P((int argc, char *argv[])); int (*initialize) LDAP_P((int argc, char *argv[]));
if (lt_dlinit()) { if (lt_dlinit()) {
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", lt_dlerror(), 0, 0); error = lt_dlerror();
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
return -1; return -1;
} }
if ((module = lt_dlopen(file_name)) == NULL) { if ((module = lt_dlopen(file_name)) == NULL) {
error = lt_dlerror();
Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name, Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name,
lt_dlerror(), 0); error, 0);
return -1; return -1;
} }
@ -32,10 +43,19 @@ int module_load(const char* file_name, int argc, char *argv[]) {
return -1; return -1;
} }
int module_path(const char *path) { int module_path(const char *path)
{
const char *error;
/*
* 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 (lt_dlinit()) { if (lt_dlinit()) {
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", lt_dlerror(), 0, 0); error = lt_dlerror();
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
return -1; return -1;
} }