diff options
| author | Michael Adam <obnox@samba.org> | 2011-07-07 17:42:08 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-07-29 13:34:22 +0200 |
| commit | 0b5c4a601a983aab06e4aba158cd9359babd1e71 (patch) | |
| tree | 8e2806398d731036115661a88867be107783e538 /source3 | |
| parent | d4c93ca721d0edd8780ce84e7cccd0e5a1ea4f37 (diff) | |
| download | samba-0b5c4a601a983aab06e4aba158cd9359babd1e71.tar.gz samba-0b5c4a601a983aab06e4aba158cd9359babd1e71.tar.bz2 samba-0b5c4a601a983aab06e4aba158cd9359babd1e71.zip | |
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
Diffstat (limited to 'source3')
50 files changed, 54 insertions, 53 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ddcc8be3f9..f0718cef6b 100644 --- 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 cf038155ae..47f743d146 100644 --- 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 40922308a1..fc9a8721de 100644 --- 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 669ddb2a3a..f458480673 100644 --- 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 index 3d70fcdcd6..6a6d4c64e5 100644 --- 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 index 9084f87d30..9084f87d30 100644 --- a/source3/include/dbwrap.h +++ b/source3/lib/dbwrap/dbwrap.h diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 049fef6bc7..454a28399f 100644 --- 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 index 6ecd72810d..6ecd72810d 100644 --- a/source3/lib/dbwrap_file.c +++ b/source3/lib/dbwrap/dbwrap_file.c diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c index 8721b1b0f9..a5e15e305a 100644 --- 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 index fd6e988864..fa91d8cb95 100644 --- 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 index 2efb3dfe39..aca57b63ce 100644 --- 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 index effcf40c6b..effcf40c6b 100644 --- a/source3/lib/dbwrap_util.c +++ b/source3/lib/dbwrap/dbwrap_util.c diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 3a983d5fb7..bed3ec1e45 100644 --- 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 76c1090b81..d66af39757 100644 --- 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 a793d77559..0e9c77dea6 100644 --- 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 f2ba07ab34..e5532756e8 100644 --- 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 dc3f61c33b..ebc1b8af79 100644 --- 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 fa67567537..86f89ffe8e 100644 --- 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 95ae0a3260..3c5108d388 100644 --- 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 b8675d3d98..99a7b8019b 100644 --- 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 70147f4844..b2e8f5fe15 100644 --- 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 0c5076f806..ded86c5276 100644 --- 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 51151df9a4..0e04105ef9 100644 --- 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 6f52bd1cd7..041aee2e8d 100644 --- 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 abfe6ee32c..10fa4a4be5 100644 --- 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 18d0be573e..bec12310c2 100644 --- 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 5459365c37..94f9da9b23 100644 --- 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 1179f5a335..3556869bd8 100644 --- 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 665e2f89a4..e1b7855b01 100644 --- 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 6d4cf237c7..458ffc619d 100644 --- 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 1c40e24b28..93ee12d817 100644 --- 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 7ad79c14ec..d39390e8c6 100644 --- 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 0aaa730c8e..82c43bf3b0 100644 --- 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 0d56cc6169..62d482069c 100644 --- 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 62487e1e4f..0add460655 100644 --- 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 4766573f62..b155d2959d 100644 --- 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 7e49664162..cbb697c63f 100644 --- 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 b55dfe976f..2dd8557a87 100644 --- 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 10f7defb81..628e5db3ca 100644 --- 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 cf0a5786b9..9de54b3376 100644 --- 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 2210ab5597..7902b0832a 100644 --- 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 5ce98f9c8c..2542a2b8d3 100644 --- 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 b1388d265d..be6a484a6c 100644 --- 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 76cd979164..2cde6e1644 100644 --- 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 4159eead7a..9d9c8ebc4b 100644 --- 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 4bd18b6d0f..f341cb8636 100644 --- 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 c1a15803eb..a60f926fac 100644 --- 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 6c326b4fde..5e3e9c08b6 100644 --- 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 d7cbb8aef6..d245e447a2 100644 --- 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 3fd655bc11..296e6b97f7 100755 --- 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) |