tdb_wrap: Move to specific directory.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 10 Mar 2012 20:33:11 +0000 (21:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 Mar 2012 22:13:01 +0000 (23:13 +0100)
It's a bit confusing to mix low-level and high-level libraries.  We had
multiple libraries in one directory, and there were have circular
dependencies with other libraries outside that directory (in this case,
samba-hostconfig).

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104

24 files changed:
lib/tdb_wrap/tdb_wrap.c [moved from lib/util/tdb_wrap.c with 99% similarity]
lib/tdb_wrap/tdb_wrap.h [moved from lib/util/tdb_wrap.h with 100% similarity]
lib/tdb_wrap/wscript_build [new file with mode: 0644]
lib/util/wscript_build
libcli/auth/schannel_state_tdb.c
source3/Makefile.in
source3/lib/dbwrap/dbwrap_ctdb.c
source3/lib/dbwrap/dbwrap_tdb.c
source3/lib/messages_local.c
source3/lib/server_mutex.c
source3/lib/serverid.c
source3/smbd/notify_internal.c
source4/cluster/local.c
source4/dsdb/samdb/ldb_modules/partition.h
source4/lib/messaging/messaging.c
source4/ntvfs/common/brlock_tdb.c
source4/ntvfs/common/notify.c
source4/ntvfs/common/opendb_tdb.c
source4/ntvfs/posix/python/pyxattr_tdb.c
source4/ntvfs/posix/vfs_posix.c
source4/ntvfs/posix/xattr_tdb.c
source4/param/secrets.c
source4/torture/local/dbspeed.c
wscript_build

similarity index 99%
rename from lib/util/tdb_wrap.c
rename to lib/tdb_wrap/tdb_wrap.c
index 7c3318b..0994b1b 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "lib/util/dlinklist.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/param/param.h"
 
 /* FIXME: TDB2 does this internally, so no need to wrap multiple opens! */
similarity index 100%
rename from lib/util/tdb_wrap.h
rename to lib/tdb_wrap/tdb_wrap.h
diff --git a/lib/tdb_wrap/wscript_build b/lib/tdb_wrap/wscript_build
new file mode 100644 (file)
index 0000000..0811bc5
--- /dev/null
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+bld.SAMBA_LIBRARY('tdb-wrap',
+                  source='tdb_wrap.c',
+                  deps='tdb_compat talloc samba-util samba-hostconfig',
+                  private_library=True,
+                  local_include=False
+                 )
index 1dc65fa..79b9f02 100755 (executable)
@@ -85,10 +85,3 @@ bld.SAMBA_SUBSYSTEM('UTIL_PW',
        public_deps='talloc'
        )
 
-
-bld.SAMBA_LIBRARY('tdb-wrap',
-                  source='tdb_wrap.c',
-                  deps='tdb_compat talloc samba-util samba-hostconfig',
-                  private_library=True,
-                  local_include=False
-                 )
index f2b9188..5d5ddcc 100644 (file)
@@ -28,7 +28,7 @@
 #include "../lib/param/param.h"
 #include "../libcli/auth/schannel.h"
 #include "../librpc/gen_ndr/ndr_schannel.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 
 #define SECRETS_SCHANNEL_STATE "SECRETS/SCHANNEL"
 
index dc02b6a..5fcf859 100644 (file)
@@ -256,7 +256,7 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
 ######################################################################
 
 TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
-         ../lib/util/tdb_wrap.o \
+         ../lib/tdb_wrap/tdb_wrap.o \
          lib/dbwrap/dbwrap.o \
          lib/dbwrap/dbwrap_open.o \
          lib/dbwrap/dbwrap_tdb.o \
index 2e0146f..d50f75e 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "util_tdb.h"
 #include "dbwrap/dbwrap_ctdb.h"
 #include "dbwrap/dbwrap_rbt.h"
index 2c82810..454073a 100644 (file)
@@ -21,7 +21,7 @@
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_private.h"
 #include "dbwrap/dbwrap_tdb.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/param/param.h"
 #include "util_tdb.h"
 
index 9b4e3c5..b398870 100644 (file)
@@ -45,7 +45,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "messages.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/param/param.h"
 
 struct messaging_tdb_context {
index 7ceecfe..9430141 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "util_tdb.h"
 #include "lib/param/param.h"
 
index 02de2b4..48d5b42 100644 (file)
@@ -23,7 +23,7 @@
 #include "util_tdb.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/param/param.h"
 #include "ctdbd_conn.h"
 #include "messages.h"
index be91cd5..d68a720 100644 (file)
@@ -30,7 +30,7 @@
 #include "dbwrap/dbwrap_open.h"
 #include "smbd/smbd.h"
 #include "messages.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "util_tdb.h"
 #include "lib/param/param.h"
 
index c62c5cf..24cbe81 100644 (file)
@@ -23,7 +23,7 @@
 #include "cluster/cluster.h"
 #include "cluster/cluster_private.h"
 #include "tdb_compat.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "system/filesys.h"
 #include "param/param.h"
 #include "librpc/gen_ndr/server_id.h"
index 0cb5705..ea05e94 100644 (file)
@@ -21,7 +21,7 @@
 #include <ldb.h>
 #include <ldb_errors.h>
 #include <ldb_module.h>
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "system/locale.h"
index 21ff1b4..9c337f6 100644 (file)
@@ -27,7 +27,7 @@
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "lib/messaging/irpc.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "../lib/util/unix_privs.h"
 #include "librpc/rpc/dcerpc.h"
 #include "../lib/tdb_compat/tdb_compat.h"
index fcaa756..5c89b41 100644 (file)
@@ -28,7 +28,7 @@
 #include "system/filesys.h"
 #include "tdb_compat.h"
 #include "messaging/messaging.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
 #include "libcli/libcli.h"
 #include "cluster/cluster.h"
index 98f17a6..6b5ece9 100644 (file)
@@ -28,7 +28,7 @@
 #include "../lib/tdb_compat/tdb_compat.h"
 #include "../lib/util/util_tdb.h"
 #include "messaging/messaging.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_notify.h"
 #include "../lib/util/dlinklist.h"
index 9884e1f..ed8fb90 100644 (file)
@@ -42,7 +42,7 @@
 #include "system/filesys.h"
 #include "../lib/tdb_compat/tdb_compat.h"
 #include "messaging/messaging.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_opendb.h"
 #include "ntvfs/ntvfs.h"
index 7248560..1fdae76 100644 (file)
@@ -21,7 +21,7 @@
 #include <Python.h>
 #include "includes.h"
 #include "tdb_compat.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "librpc/ndr/libndr.h"
 #include "lib/util/wrap_xattr.h"
 #include "ntvfs/posix/vfs_posix.h"
index cecaee0..3a3d1ea 100644 (file)
@@ -27,7 +27,7 @@
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/security.h"
 #include "tdb_compat.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "libcli/security/security.h"
 #include "lib/events/events.h"
 #include "param/param.h"
index 07b3712..2a320ba 100644 (file)
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "tdb_compat.h"
 #include "vfs_posix.h"
 
index 32a9745..aaf6259 100644 (file)
@@ -25,7 +25,7 @@
 #include "secrets.h"
 #include "param/param.h"
 #include "system/filesys.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/ldb-samba/ldb_wrap.h"
 #include <ldb.h>
 #include "../lib/util/util_tdb.h"
index 60721cc..51ea8ea 100644 (file)
@@ -25,7 +25,7 @@
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "ldb_wrap.h"
-#include "lib/util/tdb_wrap.h"
+#include "lib/tdb_wrap/tdb_wrap.h"
 #include "torture/smbtorture.h"
 #include "param/param.h"
 
index ab6f9be..f5dff8d 100644 (file)
@@ -65,6 +65,7 @@ bld.RECURSE('lib/uid_wrapper')
 bld.RECURSE('lib/popt')
 bld.RECURSE('source4/lib/stream')
 bld.RECURSE('lib/util')
+bld.RECURSE('lib/tdb_wrap')
 bld.RECURSE('lib/tdr')
 bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')