svn commit: samba r25084 - in branches/SAMBA_4_0: . source/lib source/lib/ldb source/lib/ldb/common source/lib/ldb/ldb_tdb source/lib/ldb/tools

[jelmer at samba.org]

Author: jelmer
Date: 2007-09-11 16:06:32 +0000 (Tue, 11 Sep 2007)
New Revision: 25084

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25084

Log:
Move samba-specific code out of lib/ldb directory.
Added:
   branches/SAMBA_4_0/source/lib/ldb-samba/
Removed:
   branches/SAMBA_4_0/source/lib/ldb/samba/
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/basic.mk
   branches/SAMBA_4_0/source/lib/db_wrap.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
   branches/SAMBA_4_0/source/lib/ldb/config.mk
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
   branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/basic.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/basic.mk	2007-09-11 15:50:31 UTC (rev 25083)
+++ branches/SAMBA_4_0/source/lib/basic.mk	2007-09-11 16:06:32 UTC (rev 25084)
@@ -3,6 +3,7 @@
 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

Modified: branches/SAMBA_4_0/source/lib/db_wrap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/db_wrap.c	2007-09-11 15:50:31 UTC (rev 25083)
+++ branches/SAMBA_4_0/source/lib/db_wrap.c	2007-09-11 16:06:32 UTC (rev 25084)
@@ -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"

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c	2007-09-11 15:50:31 UTC (rev 25083)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c	2007-09-11 16:06:32 UTC (rev 25084)
@@ -36,7 +36,6 @@
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
 #include "build.h"
-#include "dynconfig.h"
 #endif
 
 #define LDB_MODULE_PREFIX	"modules:"

Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk	2007-09-11 15:50:31 UTC (rev 25083)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk	2007-09-11 16:06:32 UTC (rev 25084)
@@ -312,5 +312,3 @@
 OBJ_FILES = swig/ldb_wrap.o
 # End LIBRARY swig_ldb
 #######################
-
-include samba/config.mk

Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h	2007-09-11 15:50:31 UTC (rev 25083)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h	2007-09-11 16:06:32 UTC (rev 25084)
@@ -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"

Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2007-09-11 15:50:31 UTC (rev 25083)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2007-09-11 16:06:32 UTC (rev 25084)
@@ -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"

Copied: branches/SAMBA_4_0/source/lib/ldb-samba (from rev 25083, branches/SAMBA_4_0/source/lib/ldb/samba)