From a3f61dea40d8a907d56abe1c0eee980f78228b79 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 17 Oct 2010 14:27:18 +0200 Subject: Revert "s4:remove "util_ldb" submodule and integrate the three gendb_* calls in "dsdb/common/util.c"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8a2ce5c47cee499f90b125ebde83de5f9f1a9aa0. Jelmer pointed out that these are also in use by other LDB databases - not only SAMDB ones. Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Sun Oct 17 13:37:16 UTC 2010 on sn-devel-104 --- source4/lib/basic.mk | 2 +- source4/lib/ldb-samba/wscript_build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 7df92d432d..4b40ed41d4 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -11,7 +11,7 @@ GENCACHE_OBJ_FILES = $(libgencachesrcdir)/gencache.o [SUBSYSTEM::LDB_WRAP] PUBLIC_DEPENDENCIES = LIBLDB -PRIVATE_DEPENDENCIES = LDBSAMBA +PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB LDB_WRAP_OBJ_FILES = $(libsrcdir)/ldb_wrap.o PUBLIC_HEADERS += $(libsrcdir)/ldb_wrap.h diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index a2ac32bdbe..fd07fd1aff 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('LDBSAMBA', autoproto='ldif_handlers_proto.h', public_deps='ldb', public_headers='ldb_wrap.h', - deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB' + deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS UTIL_LDB NDR_DNSP SAMDB' ) -- cgit