s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 29 13:34:22 CEST 2011 on sn-devel-104

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ddcc8be3f929895b3699f3f16fa7200ab4997ff1..f0718cef6b0b0bac12ff517d7d1cc2f01e94d5b1 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -260,11 +260,12 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
 
 TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
          ../lib/util/tdb_wrap.o \
-         lib/dbwrap.o lib/dbwrap/dbwrap_open.o \
-         lib/dbwrap_tdb.o \
-         lib/dbwrap_ctdb.o \
+         lib/dbwrap/dbwrap.o \
+         lib/dbwrap/dbwrap_open.o \
+         lib/dbwrap/dbwrap_tdb.o \
+         lib/dbwrap/dbwrap_ctdb.o \
          lib/g_lock.o \
-         lib/dbwrap_rbt.o
+         lib/dbwrap/dbwrap_rbt.o
 
 TDB_VALIDATE_OBJ = lib/tdb_validate.o
 
@@ -454,7 +455,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
          ../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
          lib/util.o lib/util_malloc.o lib/namearray.o lib/util_cmdline.o lib/util_names.o \
          lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
-         lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap_util.o \
+         lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \
          lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
          lib/tallocmsg.o lib/dmallocmsg.o \
          libsmb/clisigning.o libsmb/smb_signing.o \

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index cf038155ae287c30e00b0a733cfb6d9ee77d3cb4..47f743d146540d48d3f9672c75da014f066fd974 100644 (file)
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -24,7 +24,7 @@
 #include "system/filesys.h"
 #include "passdb.h"
 #include "groupdb/mapping.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 #include "../libcli/security/security.h"

diff --git a/source3/include/g_lock.h b/source3/include/g_lock.h
index 40922308a1116d0411b4227304c363b4b00a330f..fc9a8721de81fdc85a3cb16c7417a372cb749d1b 100644 (file)
--- a/source3/include/g_lock.h
+++ b/source3/include/g_lock.h
@@ -20,7 +20,7 @@
 #ifndef _G_LOCK_H_
 #define _G_LOCK_H_
 
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 
 struct g_lock_ctx;
 

diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index 669ddb2a3af9790d8be1ddec99508c04f10f205a..f4584806733263908bbcd678a073693084e99308 100644 (file)
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/globals.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 
 static struct db_context *connections_db_ctx(bool rw)

diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
similarity index 98%
rename from source3/lib/dbwrap.c
rename to source3/lib/dbwrap/dbwrap.c
index 3d70fcdcd6f8a1c6f10c5f6deabc0c9db13d0397..6a6d4c64e5732b666cc819d6e3677e55278c96eb 100644 (file)
--- a/source3/lib/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_private.h"
 
 /*

diff --git a/source3/include/dbwrap.h b/source3/lib/dbwrap/dbwrap.h
similarity index 100%
rename from source3/include/dbwrap.h
rename to source3/lib/dbwrap/dbwrap.h

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
similarity index 99%
rename from source3/lib/dbwrap_ctdb.c
rename to source3/lib/dbwrap/dbwrap_ctdb.c
index 049fef6bc70f847f6bd8f8f109faee516ae7e0e4..454a28399f9e18f9a497b352e43a99214034a4b6 100644 (file)
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -26,7 +26,7 @@
 #include "ctdb.h"
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "g_lock.h"
 #include "messages.h"
 

diff --git a/source3/lib/dbwrap_file.c b/source3/lib/dbwrap/dbwrap_file.c
similarity index 100%
rename from source3/lib/dbwrap_file.c
rename to source3/lib/dbwrap/dbwrap_file.c

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index 8721b1b0f923936ab64ddf926733fafd1aa6c41b..a5e15e305af0199687e90514b2b2c1c12aa8ea39 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_private.h"
 #include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"

diff --git a/source3/lib/dbwrap_rbt.c b/source3/lib/dbwrap/dbwrap_rbt.c
similarity index 99%
rename from source3/lib/dbwrap_rbt.c
rename to source3/lib/dbwrap/dbwrap_rbt.c
index fd6e988864b7fdf2b99eccb333cdea41c09f25d7..fa91d8cb95980c229db4a447a60e857c38a17534 100644 (file)
--- a/source3/lib/dbwrap_rbt.c
+++ b/source3/lib/dbwrap/dbwrap_rbt.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "../lib/util/rbtree.h"
 
 #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)

diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap/dbwrap_tdb.c
similarity index 99%
rename from source3/lib/dbwrap_tdb.c
rename to source3/lib/dbwrap/dbwrap_tdb.c
index 2efb3dfe39db2e102ccf60d85b4a014b18ae41c0..aca57b63ce7cc038b403da1736a762026b89c397 100644 (file)
--- a/source3/lib/dbwrap_tdb.c
+++ b/source3/lib/dbwrap/dbwrap_tdb.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "lib/util/tdb_wrap.h"
 
 struct db_tdb_ctx {

diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap/dbwrap_util.c
similarity index 100%
rename from source3/lib/dbwrap_util.c
rename to source3/lib/dbwrap/dbwrap_util.c

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 3a983d5fb7ca28bfcdbd436a753be91d7be4891c..bed3ec1e4586baa1bb2b5f68e52651f00a9228cc 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "g_lock.h"
 #include "util_tdb.h"

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 76c1090b8194282fc99473a58f4e79db97aedb8f..d66af3975775a4f156eec816060a2218aec9e295 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -46,7 +46,7 @@
 */
 
 #include "includes.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "serverid.h"
 #include "messages.h"
 

diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index a793d7755953da58c7cbbdc67fcc3e23f3803595..0e9c77dea6fde562d5f11cd486fec0fc5a4eff64 100644 (file)
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "lib/privileges.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "libcli/security/privileges_private.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index f2ba07ab34f7c4f2c58d3ef7d47ec6c63daf6ac9..e5532756e83dc86d029d3b5a33ee9949b02a03d4 100644 (file)
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -21,7 +21,7 @@
 #include "system/filesys.h"
 #include "serverid.h"
 #include "util_tdb.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "lib/util/tdb_wrap.h"
 

diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
index dc3f61c33b53843c127960b87b5254dda010949f..ebc1b8af79632bf625e32ef2a115bb67e32f4ebb 100644 (file)
--- a/source3/lib/sessionid_tdb.c
+++ b/source3/lib/sessionid_tdb.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "session.h"
 #include "util_tdb.h"

diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index fa67567537ffc535c4c97f0d2ae31981e04a57ee..86f89ffe8e464b0060ea4c2a04e35a01a6fd7fd3 100644 (file)
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -21,7 +21,7 @@
 #include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 

diff --git a/source3/lib/talloc_dict.c b/source3/lib/talloc_dict.c
index 95ae0a3260df25712e05c4148f47819d8ae89abc..3c5108d3880132c32f12b6d19b73d8cfd8dd1466 100644 (file)
--- a/source3/lib/talloc_dict.c
+++ b/source3/lib/talloc_dict.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "talloc_dict.h"
 #include "util_tdb.h"
 

diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index b8675d3d988920bdbde9a588081799100692ebd9..99a7b8019b04f51f018dca119ea78971d3eb4421 100644 (file)
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -24,7 +24,7 @@
 #include "../libds/common/flags.h"
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
 #include "util_tdb.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "../libds/common/flag_mapping.h"
 #include "passdb.h"
 

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 70147f4844d237017620beba5bd60a0248730a11..b2e8f5fe15d1a6494d8a023445101f71cb2498e1 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -28,7 +28,7 @@
 #include "system/filesys.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "serverid.h"
 #include "messages.h"

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 0c5076f80621a4682d2689be3bcbfdbbf97c98d9..ded86c52764991db90b4c2da6a31c4763a084cf2 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -39,7 +39,7 @@
 #include "system/filesys.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "serverid.h"

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 51151df9a431701329f0ec774c89af5845b71862..0e04105ef9d291e11e41e891e0ec968c6e920b9e 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -24,7 +24,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "locking/proto.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "util_tdb.h"
 
 #undef DBGC_CLASS

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 6f52bd1cd76c9e09dfb0317190ffec981474f5f2..041aee2e8d4453269151389492bef16262f1e127 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -23,7 +23,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "../libcli/security/dom_sid.h"
 #include "../libcli/security/security.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "system/filesys.h"
 #include "passdb/lookup_sid.h"

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index abfe6ee32cfce4673867469d5b303cff07de85f1..10fa4a4be5c84133598b8d1d854a3776ef626cdf 100644 (file)
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -26,7 +26,7 @@
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../lib/crypto/crypto.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "auth.h"
 #include "util_tdb.h"

diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index 18d0be573e23bc75583ffaacc4b102a2d748a2f5..bec12310c281bfe601a7c5260b1dcdecbdc60f44 100644 (file)
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -23,7 +23,7 @@
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5459365c37d57d48050b35a6f67b7d8b6025d517..94f9da9b23be3e3a10bbfb3120ee182923ed7679 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -65,7 +65,7 @@
 #include "../librpc/gen_ndr/svcctl.h"
 #include "intl.h"
 #include "smb_signing.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "smbldap.h"
 #include "../lib/util/bitmap.h"
 

diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c
index 1179f5a335aabd5d379affebfbb516c78181b421..3556869bd8c947e3da5f5cdd413062152f1c0621 100644 (file)
--- a/source3/passdb/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "passdb.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "lib/privileges.h"

diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 665e2f89a4535d8eb7798ade6aed3be025792074..e1b7855b01041ca664f1de3f368abf2376d1f73f 100644 (file)
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -26,7 +26,7 @@
 #include "passdb.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "../librpc/ndr/libndr.h"
 #include "util_tdb.h"
 

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 6d4cf237c773e54929b84e9cf67b3a06b72697ba..458ffc619dc702519bc1a1778dc4d8b456bf2178 100644 (file)
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "passdb.h"
 #include "secrets.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "../libcli/security/security.h"
 
 /* NOTE! the global_sam_sid is the SID of our local SAM. This is only

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 1c40e24b28246a97e701142ef2a6028866597514..93ee12d81796854d889539ef5446ed89ae6a0891 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "passdb.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "util_tdb.h"

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 7ad79c14ece55f2a6c1c8f1bf0e3196d6875e272..d39390e8c652c6616a0528df44b3299bcf170c91 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -28,7 +28,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_secrets.h"
 #include "secrets.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "util_tdb.h"

diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index 0aaa730c8e52529ddd5caf11824e97899dc4e150..82c43bf3b05adaf0dc83e438e2d99a65605a2ba3 100644 (file)
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 #include "printer_list.h"

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 0d56cc61697c80bd8a59484614ed44e5fda5f5a8..62d482069c8bd6db450112896be202b422a0e0a2 100644 (file)
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -30,7 +30,7 @@
 #include "reg_objects.h"
 #include "nt_printing.h"
 #include "util_tdb.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/secdesc.h"
 

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 62487e1e4f4dc771ae02d6b4b275294a5823fed2..0add46065508a2a633edb5664453505be6f770aa 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -24,7 +24,7 @@
 #include "registry.h"
 #include "reg_objects.h"
 #include "util_tdb.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "../libcli/registry/util_reg.h"
 
 #undef DBGC_CLASS

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 4766573f62f4ec40749161e09c4c344dfbbbcf5a..b155d2959d3b73d5da1763d752df8b06783c8aae 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -29,7 +29,7 @@
 #include "../librpc/gen_ndr/srv_srvsvc.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "session.h"
 #include "../lib/util/util_pw.h"
 #include "smbd/smbd.h"

diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 7e496641627983315a9229abc8f07ff7f7e47e9b..cbb697c63fbbb21ad0834f16799292e5473d1bc8 100644 (file)
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "auth.h"
 #include "../lib/tsocket/tsocket.h"
 

diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index b55dfe976fbfd4b04843f15c013a88c6e1741825..2dd8557a87a73e8ce55994ba2a69f24d9791456b 100644 (file)
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -26,7 +26,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_notify.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "smbd/smbd.h"
 #include "messages.h"

diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 10f7defb81e02cc409cba0bb864ebeb9ebaae300..628e5db3caf7d7e4ccfd62d94c54a5c3a9f5960d 100644 (file)
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -29,7 +29,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "session.h"
 #include "auth.h"
 #include "../lib/tsocket/tsocket.h"

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index cf0a5786b9dc60647bced2d8a24224cc847c4c90..9de54b337620a4c4a45ce0c914d3efbf0f62f273 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -28,7 +28,7 @@
 #include "../librpc/gen_ndr/svcctl.h"
 #include "memcache.h"
 #include "nsswitch/winbind_client.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "talloc_dict.h"
 #include "async_smb.h"

diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 2210ab55971550579e931744ba1796bfcc58d835..7902b0832a2d366bd55c1916b173622b8158b4a8 100644 (file)
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "messages.h"
 

diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index 5ce98f9c8c2df72d470c803b48636de9f9875079..2542a2b8d329071956151fbc6bf20347858e8c5d 100644 (file)
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "popt_common.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "messages.h"
 

diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index b1388d265dd851e01283eb082837b89440f603c0..be6a484a6c31787ff81da87b36df4fee9472a80d 100644 (file)
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -22,7 +22,7 @@
 #include "utils/net.h"
 #include "secrets.h"
 #include "idmap.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "net_idmap_check.h"

diff --git a/source3/utils/net_idmap_check.c b/source3/utils/net_idmap_check.c
index 76cd97916421f287fefc4e0917036463f7e8f841..2cde6e1644b10e34e054bee611e8e23399e9e722 100644 (file)
--- a/source3/utils/net_idmap_check.c
+++ b/source3/utils/net_idmap_check.c
@@ -26,7 +26,7 @@
 #include "net_idmap_check.h"
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "net.h"
 #include "../libcli/security/dom_sid.h"

diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index 4159eead7a78b7cb225e213a3a473045c0a2f18c..9d9c8ebc4b481a9028b65d32df79df97ee678708 100644 (file)
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "serverid.h"
 #include "session.h"
 

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 4bd18b6d0fc86ee0952919ea51839cf488f5506c..f341cb86368a365c52a12be660b84397e7aaae22 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -33,7 +33,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "popt_common.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "session.h"

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index c1a15803eb0faf049aae519885c6fb56c4eae754..a60f926fac1ab44cea14513cf2153e1eb6e01398 100644 (file)
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "winbindd.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "idmap.h"
 #include "../libcli/security/dom_sid.h"

diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 6c326b4fdeab6250956cac2208be6354f495190b..5e3e9c08b6bd4dcf0ad8b98848250a83cf3ff5a5 100644 (file)
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -28,7 +28,7 @@
 #include "winbindd.h"
 #include "idmap.h"
 #include "idmap_rw.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/security.h"
 #include "util_tdb.h"

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index d7cbb8aef65fe05fd7f5bcefa1c51e5c0a52a5b6..d245e447a27fc7448dbbb13e5b10c02bf1ac974f 100644 (file)
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -36,7 +36,7 @@
 #include "winbindd.h"
 #include "idmap.h"
 #include "idmap_rw.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "../libcli/security/dom_sid.h"
 #include "util_tdb.h"

diff --git a/source3/wscript_build b/source3/wscript_build
index 3fd655bc11d76a1a3f5aebe106d2bc5459514a8e..296e6b97f7242ba33db5909a7433127918a4ad42 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -15,8 +15,8 @@ bld.env.public_headers_allow_broken = True
 
 TDB_LIB_SRC = '''
          lib/dbwrap/dbwrap_open.c
-         lib/dbwrap_tdb.c
-          lib/dbwrap_ctdb.c
+         lib/dbwrap/dbwrap_tdb.c
+          lib/dbwrap/dbwrap_ctdb.c
           lib/g_lock.c'''
 
 TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
@@ -1008,7 +1008,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('dbwrap',
-                   source='lib/dbwrap.c lib/dbwrap_util.c lib/dbwrap_rbt.c',
+                   source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c',
                    deps='samba-util UTIL_TDB errors',
                    private_library=True)