r25084: Move samba-specific code out of lib/ldb directory.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 11 Sep 2007 16:06:32 +0000 (16:06 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 20:06:26 +0000 (15:06 -0500)
(This used to be commit 917bd737cb07817664d9088860588d47525f5ff8)

source4/lib/basic.mk
source4/lib/db_wrap.c
source4/lib/ldb-samba/README [moved from source4/lib/ldb/samba/README with 100% similarity]
source4/lib/ldb-samba/config.mk [moved from source4/lib/ldb/samba/config.mk with 100% similarity]
source4/lib/ldb-samba/ldif_handlers.c [moved from source4/lib/ldb/samba/ldif_handlers.c with 100% similarity]
source4/lib/ldb/common/ldb_modules.c
source4/lib/ldb/config.mk
source4/lib/ldb/ldb_tdb/ldb_tdb.h
source4/lib/ldb/tools/cmdline.c

index e993207b007c8caefe11217176da86272b076382..713fdcede909e9bc4cbbeeffa014133514cd81cc 100644 (file)
@@ -3,6 +3,7 @@ include samba3/config.mk
 include socket/config.mk
 include charset/config.mk
 include ldb/config.mk
+include ldb-samba/config.mk
 include tls/config.mk
 include registry/config.mk
 include policy/config.mk
index ad797fe6a0dc2ba116367f2c7b7cbdb79404ac99..92e4758f44e46133205bd12a6073e69fbae457bd 100644 (file)
@@ -32,7 +32,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb/samba/ldif_handlers.h"
+#include "lib/ldb-samba/ldif_handlers.h"
 #include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
index b279af98f684db834d3fed65ae2876d3f485d6a3..9f94c90c92065408f7ff5eec27ab772a10440533 100644 (file)
@@ -36,7 +36,6 @@
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
 #include "build.h"
-#include "dynconfig.h"
 #endif
 
 #define LDB_MODULE_PREFIX      "modules:"
index ec74599fd81cf554bf9ea2f0a6b2fd0d9b5f1230..dcc66d3bb0c6836c4a68a7576db3be4db56c06c2 100644 (file)
@@ -312,5 +312,3 @@ LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
 OBJ_FILES = swig/ldb_wrap.o
 # End LIBRARY swig_ldb
 #######################
-
-include samba/config.mk
index 956f18688b6fe5bbac4dc2c16a418ae08377f856..61b5f789d768f462dd05c7354aade87a34e6fdbf 100644 (file)
@@ -1,11 +1,4 @@
-
-#ifdef _SAMBA_BUILD_
-#include "system/filesys.h"
-#endif
-
-#if (_SAMBA_BUILD_ >= 4)
-#include "lib/tdb/include/tdb.h"
-#elif defined(_SAMBA_BUILD_)
+#if (_SAMBA_BUILD_ == 3)
 #include "tdb/include/tdb.h"
 #else
 #include "tdb.h"
index 08f5dc721fb0d80f48dd8330e169ba48b9048729..2cf82121547c1bec5fabf5f5739c6d4efc3565cf 100644 (file)
@@ -27,7 +27,7 @@
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/ldb/samba/ldif_handlers.h"
+#include "lib/ldb-samba/ldif_handlers.h"
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 #include "db_wrap.h"