sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-30 20:23:49 +03:00
Code Activity

r5664: simo, please look into this. It is possible for the number of elements

Browse Source 
in msg[0] to be 0, in which case we crash. This is a workaround.

Also, if you could please split up this function into readable
pieces. It's a bit of a mess at the moment.
This commit is contained in:
Andrew Tridgell
2005-03-05 21:59:02 +00:00
committed by Gerald (Jerry) Carter
parent 54e0be6f1e
commit 19a22f78c2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
char *modstr, *c, *p; char *modstr, *c, *p;
ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg); ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
if (ret == 0) { if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n"); ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
} else { } else {
if (ret < 0) { if (ret < 0) {
@@ -184,6 +184,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
continue; continue;
} }
#ifdef _SAMBA_BUILD_
if (strcmp(modules[i], "samldb") == 0) { if (strcmp(modules[i], "samldb") == 0) {
current = samldb_module_init(ldb, options); current = samldb_module_init(ldb, options);
if (!current) { if (!current) {
@@ -193,6 +194,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
DLIST_ADD(ldb->modules, current); DLIST_ADD(ldb->modules, current);
continue; continue;
} }
#endif
#ifdef HAVE_DLOPEN_DISABLED #ifdef HAVE_DLOPEN_DISABLED
filename = talloc_asprintf(ldb, "%s.so", modules[i]); filename = talloc_asprintf(ldb, "%s.so", modules[i]);