s3: only include tdb headers where needed.

Guenther

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index d35f3c5f34d01761595543d908d6f360091f11c3..04af27bcf3a894d0b27a842825ab978d01048980 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -26,6 +26,7 @@
 #include "groupdb/mapping.h"
 #include "../libcli/security/security.h"
 #include "lib/winbind_util.h"
+#include <tdb.h>
 
 static const struct mapping_backend *backend;
 

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 1137b8f6587ca6946b6caf6255259cf770fa8816..60cdbf14471f02920115d746ee8e9da6d92bec03 100644 (file)
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -25,6 +25,7 @@
 #include "passdb.h"
 #include "groupdb/mapping.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 #include "../libcli/security/security.h"
 
 static struct db_context *db; /* used for driver files */

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index ef291fb4ad6627709973bea2c7faf4580580ab51..36b6542da0d7110ba2574727ad0536bfa5962deb 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -20,6 +20,8 @@
 #ifndef _CTDBD_CONN_H
 #define _CTDBD_CONN_H
 
+#include <tdb.h>
+
 struct ctdbd_connection;
 struct messaging_context;
 struct messaging_rec;

diff --git a/source3/include/dbwrap.h b/source3/include/dbwrap.h
index ef35b0071d0b797d1c61064b878ede1d3aa0d3f3..d657ee7f30822c465fe63dbe70cc1f617049fc2f 100644 (file)
--- a/source3/include/dbwrap.h
+++ b/source3/include/dbwrap.h
@@ -20,6 +20,8 @@
 #ifndef __DBWRAP_H__
 #define __DBWRAP_H__
 
+#include <tdb.h>
+
 struct db_record {
        TDB_DATA key, value;
        NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag);

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 59aa45afd7a4fa2ba12af7147292fce2741c2b82..ddac6d02d1540fe8ffdee7cb8b60cd434df07d80 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -510,8 +510,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/attr.h"
 #include "../lib/util/tsort.h"
 #include "../lib/util/dlinklist.h"
-#include <tdb.h>
-#include "util_tdb.h"
 
 #include <talloc.h>
 
@@ -522,6 +520,7 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/debug.h"
 #include "../lib/util/debug_s3.h"
 
+#include "../libcli/util/ntstatus.h"
 #include "libads/ads_status.h"
 #include "../libcli/util/error.h"
 #include "../lib/util/charset/charset.h"

diff --git a/source3/include/printing.h b/source3/include/printing.h
index 084c699c5bd229a0f0049c3eb4a5ec796aa7364d..bba7d53a162847fe3b05b2f98a4b65b9c1d66ee3 100644 (file)
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -158,9 +158,12 @@ extern struct printif      iprint_printif;
 /* There can be this many printing tdb's open, plus any locked ones. */
 #define MAX_PRINT_DBS_OPEN 1
 
+struct TDB_DATA;
+struct tdb_context;
+
 struct tdb_print_db {
        struct tdb_print_db *next, *prev;
-       TDB_CONTEXT *tdb;
+       struct tdb_context *tdb;
        int ref_count;
        fstring printer_name;
 };
@@ -249,7 +252,7 @@ uint32_t print_parse_jobid(const char *fname);
 struct tdb_print_db *get_print_db_byname(const char *printername);
 void release_print_db( struct tdb_print_db *pdb);
 void close_all_print_db(void);
-TDB_DATA get_printer_notify_pid_list(TDB_CONTEXT *tdb, const char *printer_name, bool cleanlist);
+struct TDB_DATA get_printer_notify_pid_list(struct tdb_context *tdb, const char *printer_name, bool cleanlist);
 
 void print_queue_receive(struct messaging_context *msg,
                                void *private_data,

diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
index 15793b78285f8044a60427f90f54046631577bfb..c6206c16e47b34fa742642c508afd6ec85fb675d 100644 (file)
--- a/source3/intl/lang_tdb.c
+++ b/source3/intl/lang_tdb.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "intl/lang_tdb.h"
+#include "util_tdb.h"
 
 static TDB_CONTEXT *tdb;
 

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9c353baba455d728c56ea25ddfbfe0f452560963..d27186996e6eeeb84594365dcae61a7e78e21c66 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "util_tdb.h"
 
 #ifdef CLUSTER_SUPPORT
 

diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c
index 4e7346c2c4f73289ab9d0f0d3c0c385094741958..9b3197f402e5e344a28255c1cf0d7e43bd0d0395 100644 (file)
--- a/source3/lib/dbwrap.c
+++ b/source3/lib/dbwrap.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 #ifdef CLUSTER_SUPPORT
 #include "ctdb_private.h"
 #endif

diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index f9a7dd6a6ff5e5f013b9545240bc933bf1a522bd..298f4c16a54ea5cd8d92b27772f836a31fc5df6a 100644 (file)
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -20,6 +20,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/tdb_wrap.h"
+#include "util_tdb.h"
 #ifdef CLUSTER_SUPPORT
 #include "ctdb.h"
 #include "ctdb_private.h"

diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c
index 35f8a14d0d487e7429271b025a987a5040029b3b..365f0a0666784d93a4e8f6f3cb8221593f745123 100644 (file)
--- a/source3/lib/dbwrap_util.c
+++ b/source3/lib/dbwrap_util.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 
 int32_t dbwrap_fetch_int32(struct db_context *db, const char *keystr)
 {

diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index 4941199c5eaf050b1647225589a8635d7694e0e0..0ff0cb1fa80cdaa5e2b13c2b4da32944d4586928 100644 (file)
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "lib/eventlog/eventlog.h"
 #include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 /* maintain a list of open eventlog tdbs with reference counts */
 

diff --git a/source3/lib/eventlog/eventlog.h b/source3/lib/eventlog/eventlog.h
index 29c25c312228dbd3163969a6810a7e0e05a769a5..b485bfe08e93fa908a0068b49f81f7044a14cc4b 100644 (file)
--- a/source3/lib/eventlog/eventlog.h
+++ b/source3/lib/eventlog/eventlog.h
@@ -17,6 +17,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <tdb.h>
+
 /* Defines for TDB keys */
 #define  EVT_OLDEST_ENTRY  "INFO/oldest_entry"
 #define  EVT_NEXT_RECORD   "INFO/next_record"

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 184da9b4fdec8f7af6d054d794308619f892d722..c3d863f9a44fb2e6f4309cb1f05bab5aa3b33c69 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "g_lock.h"
+#include "util_tdb.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/select.h"
 #include "system/select.h"

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index 19cc7c947c3f37fb102d31dcd85c0ee45976708e..7a86063de5d77ae4ed8a01208c3174dc4836639b 100644 (file)
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/glob.h"
+#include "util_tdb.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 3e2fde0b8fd36d0debee38111c2670cae6fcd62a..70f29b795ecf410bac2ee3de09fc9e419e0ff2fd 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "messages.h"
+#include "util_tdb.h"
 
 #ifdef CLUSTER_SUPPORT
 

diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c
index 9d38907a20c40fe78bfc4ff633cc3772aea5774a..6eac3182bee8f5836b80215b13eefbc5cf3006e8 100644 (file)
--- a/source3/lib/server_mutex.c
+++ b/source3/lib/server_mutex.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/util/tdb_wrap.h"
+#include "util_tdb.h"
 
 /* For reasons known only to MS, many of their NT/Win2k versions
    need serialised access only.  Two connections at the same time

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 7105e179d78433c3e2a4a55ac238728667cb3338..b1f6a5711ef65abac9d7939f600c9cca143066bf 100644 (file)
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "serverid.h"
+#include "util_tdb.h"
 #include "dbwrap.h"
 #include "lib/util/tdb_wrap.h"
 

diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
index ab54ec9ca5f8222ca0fcc611ebb7f3a644367818..de3ccab26ae84003ccd15cee58841fff490b31c9 100644 (file)
--- a/source3/lib/sessionid_tdb.c
+++ b/source3/lib/sessionid_tdb.c
@@ -21,6 +21,7 @@
 #include "system/filesys.h"
 #include "dbwrap.h"
 #include "session.h"
+#include "util_tdb.h"
 
 static struct db_context *session_db_ctx(void)
 {

diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index c84e8fa00b2cde7cab3afe794d28f3d662e152a9..c2494e2293a1501783c8a1e5c6f6713a8e05c20c 100644 (file)
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -22,6 +22,7 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 
 /*******************************************************************
  Create the share security tdb.

diff --git a/source3/lib/talloc_dict.c b/source3/lib/talloc_dict.c
index cbe5c7b5c2abcb9d32f05c2d67fe881d15766ab1..95ae0a3260df25712e05c4148f47819d8ae89abc 100644 (file)
--- a/source3/lib/talloc_dict.c
+++ b/source3/lib/talloc_dict.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "dbwrap.h"
 #include "talloc_dict.h"
+#include "util_tdb.h"
 
 struct talloc_dict {
        struct db_context *db;

diff --git a/source3/lib/tdb_validate.c b/source3/lib/tdb_validate.c
index b91ea7af834b35d6a93c4584f30582bc1e4c0884..7dd7dae5ac14b50e6e40447606f784771f017705 100644 (file)
--- a/source3/lib/tdb_validate.c
+++ b/source3/lib/tdb_validate.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "util_tdb.h"
 #include "tdb_validate.h"
 
 /*

diff --git a/source3/lib/util.c b/source3/lib/util.c
index db92f3c0d7ad2a360e87b1726aae3a89568c106c..8d90569863f4de88b55a7a8c528d5f9f75fcac82 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/passwd.h"
 #include "system/filesys.h"
+#include "util_tdb.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
 #include "messages.h"

diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 2aff935bdf0fbecd2eaabc49ff9fef0f949bf385..654a538a884140804fc5980d0c62e974336b5cd9 100644 (file)
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -21,6 +21,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "util_tdb.h"
+
 #undef malloc
 #undef realloc
 #undef calloc

diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index 349b25a9873d41e757f2d5225a219b5341749cf2..b8675d3d988920bdbde9a588081799100692ebd9 100644 (file)
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -23,6 +23,7 @@
 #include "../libcli/security/security.h"
 #include "../libds/common/flags.h"
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
+#include "util_tdb.h"
 #include "dbwrap.h"
 #include "../libds/common/flag_mapping.h"
 #include "passdb.h"

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index facdbc7dc194f6fa77c9cd79c0c15aeba1840436..590c950a9cc77b98eed38603b78afb85fc564c97 100644 (file)
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 #define NETSAMLOGON_TDB        "netsamlogon_cache.tdb"
 

diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index 1a6c2123ed6698f5dc686606a157232a475df035..76e63e6968987aeb31c6b16d30ba38b9b6fc9c1e 100644 (file)
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smb_share_modes.h"
+#include <tdb.h>
 
 /* Database context handle. */
 struct smbdb_ctx {

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 1f63bdd4c41fc3cd4cbedc275cbdc6721e8b63ef..9bb3b9cf2e790664d8d9468fd9bc26a9a3264b59 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -43,6 +43,7 @@
 #include "../libcli/security/security.h"
 #include "serverid.h"
 #include "messages.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index cea8d2f8a2e7be751a3f3193724ab057099c1019..3f1aa6da571ec68c6a5e2234e5accb933f5528df 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "locking/proto.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 14d464451fa720ac67e7153a029e3708d49e4604..91e98f6be83a7770e107795f7609ef89ad3652a4 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -26,6 +26,7 @@
 #include "include/dbwrap.h"
 #include "system/filesys.h"
 #include "passdb/lookup_sid.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index f2e0415293642c10e58b3b301ed463fdc133769d..1e3313120cafdae8082f3e2ef40395a1fe6a90e6 100644 (file)
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -28,6 +28,7 @@
 #include "../lib/crypto/crypto.h"
 #include "dbwrap.h"
 #include "auth.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index b8281dda214bc1a85b36818b1a037eddbc558eff..2cfea9cacd5d5e3753963f9c0f0cc3bf4d85a58e 100644 (file)
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 976b99023ebf5e40896d5b1dbe589830ec7e2a15..d5691547198ae778f5d98f89006f08a0e0ef801b 100644 (file)
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "nmbd/nmbd.h"
+#include "util_tdb.h"
 
 #define WINS_LIST "wins.dat"
 #define WINS_VERSION 1

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index cfe8668772e809d3eafda9e382887bfa260327f6..bf504a41b7d0595236266770298fcd5595a7371e 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -53,6 +53,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "util_tdb.h"
 #include "printing.h"
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"

diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c
index 1785a4dacac6c7653f05c595e8ffeb2dd742f449..629f8a7d5e8627b7b654485298b5d221e40b2895 100644 (file)
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "passdb.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index a51a99c9a2f0731587553ef717650fe005476cc6..61894d4ee662207d381eee7aff123cd698902210 100644 (file)
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -28,6 +28,7 @@
 #include "secrets.h"
 #include "dbwrap.h"
 #include "../librpc/ndr/libndr.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index a2fc12ae4bf56f1322bd8718be3dfa06595872d3..992f1b8741c8ddf8956f9a8f2aaa16b75eef89b2 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -29,6 +29,7 @@
 #include "secrets.h"
 #include "../libcli/security/security.h"
 #include "../lib/util/util_pw.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 79c0ed196afb2f51980d70b4f0e17b223d96422d..28461d0ac3d3d16ddcc5c7acd7a251dd1720c7be 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -27,6 +27,7 @@
 #include "passdb.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 #if 0 /* when made a module use this */
 

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index c16d15807bdd1b8e15cde65589940248ceec33f4..8d544f1240207df04508600ed3cd5e8ad3b7c05d 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -30,6 +30,7 @@
 #include "secrets.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 9e4b740859cf97a72f60d6a821807500db8d677c..0c7236ef3b9c563d6f0f63573e0470ade6d3b373 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -25,6 +25,7 @@
 #include "nt_printing.h"
 #include "printing/notify.h"
 #include "messages.h"
+#include "util_tdb.h"
 
 static TALLOC_CTX *send_ctx;
 

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 7c8736875bdfcb034fd7f25d9a5bfd4830c26b21..5fd0aae7fc1402f7c04df91e9e03a3d77193bf30 100644 (file)
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "rpc_server/rpc_ncacn_np.h"
 #include "auth.h"
+#include "util_tdb.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index 98ac46797fcbf8b661142bb67a4495738697c36a..e321b905d5f7aa5a19698b4f88f9cdb0063dc742 100644 (file)
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/spoolss.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
+#include "util_tdb.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index 417eea777bb15e15912ddc126bd31b1873ed10cc..d8be89363e515922b451c475057e0201df2bf75d 100644 (file)
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "dbwrap.h"
+#include "util_tdb.h"
 #include "printer_list.h"
 
 #define PL_DB_NAME() lock_path("printer_list.tdb")

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 785e893d3a57d9aedb880971e0622711d23a5b22..f15bd4f754a435928e4eecfd4a4921220a2e50b8 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -32,6 +32,7 @@
 #include "smbd/smbd.h"
 #include "auth.h"
 #include "messages.h"
+#include "util_tdb.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;

diff --git a/source3/printing/printing_db.c b/source3/printing/printing_db.c
index 70accab93503261972dc69628a113c10d48dbe13..b836c2145b4eaa30c0581ff32742037fc53f8b42 100644 (file)
--- a/source3/printing/printing_db.c
+++ b/source3/printing/printing_db.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing.h"
+#include "util_tdb.h"
 
 static struct tdb_print_db *print_db_head;
 
@@ -159,7 +160,7 @@ void close_all_print_db(void)
  messages. data needs freeing on exit.
 ****************************************************************************/
 
-TDB_DATA get_printer_notify_pid_list(TDB_CONTEXT *tdb, const char *printer_name, bool cleanlist)
+struct TDB_DATA get_printer_notify_pid_list(struct tdb_context *tdb, const char *printer_name, bool cleanlist)
 {
        TDB_DATA data;
        size_t i;

diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c
index 4bff290e28a6cfede47e6fddf3cf6d181901e5c4..b22050632ea0124ec56ef9b3f80deee5614ceba7 100644 (file)
--- a/source3/printing/tests/vlp.c
+++ b/source3/printing/tests/vlp.c
@@ -23,6 +23,7 @@
 #include "system/passwd.h"
 #include "system/filesys.h"
 #include "printing.h"
+#include "util_tdb.h"
 
 #ifdef malloc
 #undef malloc

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 6024a354c47bdf59c0ec984cdf37dd2a42615dfe..df0cb7f81e694cca240837471586a1ae90836bd0 100644 (file)
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -28,6 +28,7 @@
 #include "reg_backend_db.h"
 #include "reg_objects.h"
 #include "nt_printing.h"
+#include "util_tdb.h"
 #include "dbwrap.h"
 
 #undef DBGC_CLASS

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 0fab3f7d8bead7dcaa95da3c3550a8224c596342..980986f95bf1a52a354fcb0195da7973ce549ccb 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_objects.h"
+#include "util_tdb.h"
 #include "dbwrap.h"
 #include "../libcli/registry/util_reg.h"
 

diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index 4ed3305c15882d62a840c717d995d2e77e208451..8a2b444e0126b56e5f7c2bb5d715d4217920246a 100644 (file)
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -25,6 +25,7 @@
 #include "registry.h"
 #include "reg_perfcount.h"
 #include "../libcli/registry/util_reg.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c
index b63d1ab5f55859ff1494034088d3b845116bd415..b4c59ba51749cd830094654f8234cfd81e5d9bf2 100644 (file)
--- a/source3/rpc_server/eventlog/srv_eventlog_nt.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c
@@ -30,6 +30,7 @@
 #include "rpc_client/cli_winreg.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "util_tdb.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 720564f88d57f936216e4acc9d99dee86218108f..c88faa363f208a0596c24fab43531e5e840455c9 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -50,6 +50,7 @@
 #include "auth.h"
 #include "messages.h"
 #include "rpc_server/spoolss/srv_spoolss_nt.h"
+#include "util_tdb.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index b9063ccbb8913625f5ca84791bd16f74db0b1f53..bdf85dbfc3896f65e82f904c261114ea4bd50691 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -21,6 +21,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"
+#include "util_tdb.h"
 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
 

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 63c1f5dcb5dee58ee12740f33ed3f57dcae8622a..8e6f46fe5cddfa60a654abaae0137f591e0ec032 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "memcache.h"
 #include "messages.h"
+#include <tdb.h>
 
 #if defined(WITH_AIO)
 struct aio_extra *aio_list_head = NULL;

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 01be31a57f96bff504007652ccf008db537b84a9..97d75fd4137e46bb7de4e92c4ff575890b37019d 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -47,7 +47,8 @@ struct fsp_singleton_cache {
 extern const struct mangle_fns *mangle_fns;
 
 extern unsigned char *chartest;
-extern TDB_CONTEXT *tdb_mangled_cache;
+struct tdb_context;
+extern struct tdb_context *tdb_mangled_cache;
 
 /*
   this determines how many characters are used from the original filename

diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index 0451809cac6bacbc69f46b345495047c4931c1b7..575c35e458bd09869a22d3c501d0df9100ed184f 100644 (file)
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -25,6 +25,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "mangle.h"
+#include "util_tdb.h"
 
 /* -------------------------------------------------------------------------- **
  * Other stuff...

diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 176fa863a50c3b13a80ac5f6781645b5f5361bdc..30985022182c93bb00e64b12ff68e5b41d8a1843 100644 (file)
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -30,6 +30,7 @@
 #include "smbd/smbd.h"
 #include "messages.h"
 #include "lib/util/tdb_wrap.h"
+#include "util_tdb.h"
 
 struct notify_context {
        struct db_context *db_recursive;

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 2ea01c2a5ea0ba21430f688be95db0a6e4360396..1f2b1a9cffa003a0ebaedac2091e93300cd24f68 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -999,7 +999,8 @@ bool stat_cache_lookup(connection_struct *conn,
 void send_stat_cache_delete_message(struct messaging_context *msg_ctx,
                                    const char *name);
 void stat_cache_delete(const char *name);
-unsigned int fast_string_hash(TDB_DATA *key);
+struct TDB_DATA;
+unsigned int fast_string_hash(struct TDB_DATA *key);
 bool reset_stat_cache( void );
 
 /* The following definitions come from smbd/statvfs.c  */

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 5c74b928550312956dd1ed61318d8c95b033d7bd..e2ccc74a87ae2f11aee30855ae68267c0dd20b37 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -25,6 +25,7 @@
 #include "smbd/smbd.h"
 #include "messages.h"
 #include "smbprofile.h"
+#include <tdb.h>
 
 /****************************************************************************
  Stat cache code used in unix_convert.
@@ -376,7 +377,7 @@ void stat_cache_delete(const char *name)
  JRA. Use a djb-algorithm hash for speed.
 ***************************************************************/
 
-unsigned int fast_string_hash(TDB_DATA *key)
+unsigned int fast_string_hash(struct TDB_DATA *key)
 {
         unsigned int n = 0;
         const char *p;

diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 2794b4b57e20d8cc83045aa09447f1f4a6ac45b4..becb30ad115f288419751895fe2383eb2430e7d4 100644 (file)
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -21,6 +21,7 @@
 #include "system/filesys.h"
 #include "torture/proto.h"
 #include "libsmb/clirap.h"
+#include "util_tdb.h"
 
 extern int torture_numops;
 

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index fe9a5cb093784fc57fc7274b844717d1db8440ab..f16b5a748e3e2aabad7c32a8007eac9e8ec4fbf1 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -35,6 +35,7 @@
 #include "trans2.h"
 #include "libsmb/nmblib.h"
 #include "../lib/util/tevent_ntstatus.h"
+#include "util_tdb.h"
 
 extern char *optarg;
 extern int optind;

diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index e059a6432c0c4cd59e59abe6698b9cb2d75d7cc6..383035e906c1213afa7c58191463161d08da75f4 100644 (file)
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -25,6 +25,7 @@
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 #include "net_idmap_check.h"
+#include "util_tdb.h"
 
 #define ALLOC_CHECK(mem) do { \
        if (!mem) { \

diff --git a/source3/utils/net_idmap_check.c b/source3/utils/net_idmap_check.c
index 88725e18a614ddec1b0a14f95d2ee40b06018938..e406a65679eb1cd3352f51d03c66ce62e8f3f6ef 100644 (file)
--- a/source3/utils/net_idmap_check.c
+++ b/source3/utils/net_idmap_check.c
@@ -32,6 +32,7 @@
 #include "cbuf.h"
 #include "srprs.h"
 #include <termios.h>
+#include "util_tdb.h"
 
 static int traverse_commit(struct db_record *diff_rec, void* data);
 static int traverse_check(struct db_record *rec, void* data);

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index ade399bf44494aec03a8a98291b9734009da9b2b..3e70f1a86f599a5fadb1946c02a0d1438045b9d9 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -28,6 +28,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "util_tdb.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 0c14985bada860806af91714c9bf62b72ae077b1..5bf5c5da7b48806d1af0a2693949b410d4da0ebe 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -31,6 +31,7 @@
 #include "printing/notify.h"
 #include "libsmb/nmblib.h"
 #include "messages.h"
+#include "util_tdb.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 5e3dacf624053d5a608b598407bb9e4e55316a19..1f4af335106e11d423a62367aaa18210568a7c33 100644 (file)
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -28,6 +28,7 @@
 #include "dbwrap.h"
 #include "idmap.h"
 #include "../libcli/security/dom_sid.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 19e7f0e1d5f1d88be9764241d1d50a61d0ef0f92..57a5e1c6ba309a4d74ac2a5a3edae97febde2695 100644 (file)
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -30,6 +30,7 @@
 #include "idmap_rw.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 1a5a51a5b443c6f37327327e5d3c94f797ee27e6..2a152444595121f5504798a288c10584c5f6fe9b 100644 (file)
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -38,6 +38,7 @@
 #include "idmap_rw.h"
 #include "dbwrap.h"
 #include "../libcli/security/dom_sid.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 4fa23751526912ceb737fc9143ed45b019b0cbef..d733be06723dd638bcd5262a2826a1f6ca3dbd86 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -33,6 +33,7 @@
 #include "nss_info.h"
 #include "../libcli/security/security.h"
 #include "passdb/machine_sid.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND