diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/db_wrap.c | 9 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/samba/ldif_handlers.c | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index c277f2d975..b000225bbf 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -102,6 +102,15 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx, ev = talloc_find_parent_bytype(mem_ctx, struct event_context); if (ev) { ldb_set_opaque(ldb, "EventContext", ev); + } else { + DEBUG(0,("WARNING: event_context not found\n")); + talloc_show_parents(mem_ctx, stdout); + } + + ret = ldb_register_samba_handlers(ldb); + if (ret == -1) { + talloc_free(ldb); + return NULL; } ret = ldb_connect(ldb, url, flags, options); diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 00568aeda8..cf3a7fa93d 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -72,7 +72,7 @@ ADD_OBJ_FILES = \ lib/ldb/common/ldb_modules.o \ lib/ldb/common/ldb_explode_dn.o REQUIRED_SUBSYSTEMS = \ - LIBREPLACE LIBTALLOC + LIBREPLACE LIBTALLOC LDBSAMBA NOPROTO = YES # # End SUBSYSTEM LIBLDB @@ -103,7 +103,7 @@ OBJ_FILES = \ [SUBSYSTEM::LIBLDB_CMDLINE] OBJ_FILES= \ lib/ldb/tools/cmdline.o -REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC LDBSAMBA +REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC # End SUBSYSTEM LIBLDB_CMDLINE ################################################ diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c index 7252d081f1..17a45df78d 100644 --- a/source4/lib/ldb/samba/ldif_handlers.c +++ b/source4/lib/ldb/samba/ldif_handlers.c @@ -85,11 +85,5 @@ static const struct ldb_ldif_handler samba_handlers[] = { */ int ldb_register_samba_handlers(struct ldb_context *ldb) { -#if 0 - /* we can't enable this until we fix the sam code to handle - non-string elements */ return ldb_ldif_add_handlers(ldb, samba_handlers, ARRAY_SIZE(samba_handlers)); -#else - return 0; -#endif } |