r25084: Move samba-specific code out of lib/ldb directory.

source/lib/basic.mk

@@ -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

source/lib/db_wrap.c

@@ -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"

source/lib/ldb/common/ldb_modules.c

@@ -36,7 +36,6 @@
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
 #include "build.h"
-#include "dynconfig.h"
 #endif
 
 #define LDB_MODULE_PREFIX	"modules:"

source/lib/ldb/config.mk

@@ -312,5 +312,3 @@ LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
 OBJ_FILES = swig/ldb_wrap.o
 # End LIBRARY swig_ldb
 #######################
-
-include samba/config.mk

source/lib/ldb/ldb_tdb/ldb_tdb.h

@@ -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"

source/lib/ldb/tools/cmdline.c

@@ -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"