From df4a6e82280845668dee6fe10f2025c9fa2b958c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 19 Jun 2012 12:43:10 +0930 Subject: ldb: use tdb directly, not tdb_compat. Signed-off-by: Rusty Russell --- lib/ldb-samba/ldb_wrap.c | 5 +++-- lib/ldb-samba/wscript_build | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/ldb-samba') diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c index b8af8c151f..83a06743be 100644 --- a/lib/ldb-samba/ldb_wrap.c +++ b/lib/ldb-samba/ldb_wrap.c @@ -35,7 +35,7 @@ #include "dsdb/samdb/samdb.h" #include "param/param.h" #include "../lib/util/dlinklist.h" -#include "../lib/tdb_compat/tdb_compat.h" +#include /* this is used to catch debug messages from ldb @@ -320,7 +320,8 @@ int samba_ldb_connect(struct ldb_context *ldb, struct loadparm_context *lp_ctx, /* when we fork() we need to make sure that any open ldb contexts have - any open transactions cancelled + any open transactions cancelled (ntdb databases doesn't need reopening, + as we don't use clear_if_first). */ void ldb_wrap_fork_hook(void) { diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build index 85eb66c1b3..b0d2dcaa30 100644 --- a/lib/ldb-samba/wscript_build +++ b/lib/ldb-samba/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba', source='ldif_handlers.c', autoproto='ldif_handlers_proto.h', public_deps='ldb', - deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb_compat pyldb-util errors', + deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util errors', private_library=True ) -- cgit