tdb_wrap: Move to specific directory.

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

diff --git a/lib/util/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c
similarity index 99%
rename from lib/util/tdb_wrap.c
rename to lib/tdb_wrap/tdb_wrap.c
index 7c3318bcadf9c10f58fb2608609c310bf6b03a87..0994b1b79cab93d54f37c6b5ee3f45fd62af6c91 100644 (file)
--- a/lib/util/tdb_wrap.c
+++ b/lib/tdb_wrap/tdb_wrap.c
@@ -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! */

diff --git a/lib/util/tdb_wrap.h b/lib/tdb_wrap/tdb_wrap.h
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
+++ b/lib/tdb_wrap/wscript_build
@@ -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
+                 )

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 1dc65fab5e9f71658966782dde548f1e2ffa87ce..79b9f02050c80beb1fe8c3ca3c53d7b4fdddc9cd 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -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
-                 )

diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c
index f2b918816a77624e9f4870d8b516c8a0719f525f..5d5ddcc45dd27d7c2b388d82ead902f057c6b3ec 100644 (file)
--- a/libcli/auth/schannel_state_tdb.c
+++ b/libcli/auth/schannel_state_tdb.c
@@ -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"
 

diff --git a/source3/Makefile.in b/source3/Makefile.in
index dc02b6a4cd1e5becba2c866a7ef7e91e2189af33..5fcf8598e3d2736cd9f7c9df22d7b9a1c0c7c3c5 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -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 \

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 2e0146fdb0153fbe17d633e75603ab33d5af97ec..d50f75ef5d9b37ff58cf0b470a5bbbb70aea8ba9 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -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"

diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/source3/lib/dbwrap/dbwrap_tdb.c
index 2c82810c5065b4232210cb74533822269b3a8205..454073a52f1e7b5273cc73ffe05de50ee1eb4939 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_tdb.c
+++ b/source3/lib/dbwrap/dbwrap_tdb.c
@@ -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"
 

diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 9b4e3c5e430aefc30479a838e5c49ba66219bec2..b398870e1f2b3354c3e06f4d5b85375c75197050 100644 (file)
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -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 {

diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c
index 7ceecfe770731bad0abd80984d785a723d522e13..9430141d1ce4ec9dc5357fb7e65b153641cb89d1 100644 (file)
--- a/source3/lib/server_mutex.c
+++ b/source3/lib/server_mutex.c
@@ -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"
 

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 02de2b4f9cacd23e04a4182d00509172847aa70e..48d5b4251a18d842ca2d14c20d5457c4bbdc15a0 100644 (file)
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -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"

diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index be91cd58cdb447c165ee1af7654322a5876c8c7f..d68a720e6bf034fb36213d742524c2eecee3ef06 100644 (file)
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -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"
 

diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index c62c5cf405e7de22614552352de393dd17340a29..24cbe81c48277c605aeaef61948b3fe5a704a834 100644 (file)
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -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"

diff --git a/source4/dsdb/samdb/ldb_modules/partition.h b/source4/dsdb/samdb/ldb_modules/partition.h
index 0cb5705ada7077f4eb1279d06882660c91f038d0..ea05e9404d5e7ea58523b2f5f45ad7dfbbe34509 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/partition.h
+++ b/source4/dsdb/samdb/ldb_modules/partition.h
@@ -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"

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 21ff1b456a95ff1214471e1ae83e5ee45d30ce3d..9c337f65a581d5d70834211c0681dc2c1f83d130 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -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"

diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index fcaa756530229b3efcee512a167076abef6d8631..5c89b41b22faad2e4809c3a06b3dc24b261ccdf1 100644 (file)
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -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"

diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index 98f17a65654bc287200ab61606cb0a8997e3c031..6b5ece9e4ec6c855b5dfb0dc799caf2aee38eac1 100644 (file)
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -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"

diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 9884e1f8b0d9a78e6647e50f16832735c49f8243..ed8fb9032a048dd65a790bd5810d54e556ddb5ed 100644 (file)
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -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"

diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index 7248560039dfa8bdc5163efa1395f30582a78521..1fdae7606d33d406ee7da9aa2a3ee4cbb813970f 100644 (file)
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -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"

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index cecaee00cca1206980f219479a8e6050449b9282..3a3d1ea1c591660a1aa56d76495249238255ed81 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -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"

diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 07b371221589f3041f7b72bb7d119c1133d57b95..2a320ba7a6d41453aab2223719b4cfd2c7002608 100644 (file)
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/source4/ntvfs/posix/xattr_tdb.c
@@ -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"
 

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 32a97453d43325b1d0cdf1e468b8466e049dc8e9..aaf6259ef0efca34149e374e46641c0d075777c2 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -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"

diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 60721cc2c087d001c0fc7a14f49e903a787b9843..51ea8eaeef40a19e10e2a263706ef426f39c2628 100644 (file)
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -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"
 

diff --git a/wscript_build b/wscript_build
index ab6f9be40cbdd61b205ed1b31c9d740f8f920fff..f5dff8d6fee55e6a449fb7be76067611100802c0 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -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')