sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-04 05:18:06 +03:00
Code

r6087: - remove the dlopen code for now (before it goes back, it needs to be

Browse Source 
made into something that isn't a maze of #ifdefs)

- when a module is not found, make it a non-fatal error. Otherwise the standalone ldb
  tools just bail out. The previous code meant that if you had a
  module listed and it wasn't present then you could _never_ fix it,
  as you coudln't open the ldb to remove that module from @MODULES !
This commit is contained in:
Andrew Tridgell 2005-03-28 00:40:18 +00:00 committed by Gerald (Jerry) Carter
parent a6e492f95c
commit c4728625c0
1 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/lib/ldb/common/ldb_modules.c
View File

@ -167,13 +167,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
}
for (i = 0; modules[i] != NULL; i++) {
#ifdef HAVE_DLOPEN_DISABLED
void *handle;
ldb_module_init_function init;
struct stat st;
char *filename;
const char *errstr;
#endif
struct ldb_module *current;
if (strcmp(modules[i], "schema") == 0) {
@ -208,43 +201,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
}
#endif
#ifdef HAVE_DLOPEN_DISABLED
filename = talloc_asprintf(ldb, "%s.so", modules[i]);
if (!filename) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "Talloc failed!\n");
return -1;
}
if (stat(filename, &st) < 0) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
return -1;
}
handle = dlopen(filename, RTLD_LAZY);
if (!handle) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "Error loading module %s [%s]\n", modules[i], dlerror());
return -1;
}
init = (ldb_module_init_function)dlsym(handle, "init_module");
errstr = dlerror();
if (errstr) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "Error trying to resolve symbol 'init_module' in %s [%s]\n", modules[i], errstr);
return -1;
}
current = init(ldb, options);
if (!current) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
return -1;
}
DLIST_ADD(ldb->modules, current);
#else
ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
return -1;
#endif
ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", modules[i]);
}
talloc_free(modules);