summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-05-05 11:25:29 +0200
committerGünther Deschner <gd@samba.org>2011-05-06 10:48:10 +0200
commitd8cfca3a9bd2b6b6c562fd202377d95a98eb5472 (patch)
tree96fc9d454a01cbb2c26a8db22f41b8bf0dc40879 /source3/smbd
parent8aae59a277fe4bf5a1a84cb4730e5772c9ffca8c (diff)
downloadsamba-d8cfca3a9bd2b6b6c562fd202377d95a98eb5472.tar.gz
samba-d8cfca3a9bd2b6b6c562fd202377d95a98eb5472.tar.bz2
samba-d8cfca3a9bd2b6b6c562fd202377d95a98eb5472.zip
s3: only include tdb headers where needed.
Guenther
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/files.c1
-rw-r--r--source3/smbd/globals.c1
-rw-r--r--source3/smbd/globals.h3
-rw-r--r--source3/smbd/mangle_hash.c1
-rw-r--r--source3/smbd/notify_internal.c1
-rw-r--r--source3/smbd/proto.h3
-rw-r--r--source3/smbd/statcache.c3
7 files changed, 10 insertions, 3 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index b9063ccbb8..bdf85dbfc3 100644
--- 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 63c1f5dcb5..8e6f46fe5c 100644
--- 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 01be31a57f..97d75fd413 100644
--- 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 0451809cac..575c35e458 100644
--- 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 176fa863a5..3098502218 100644
--- 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 2ea01c2a5e..1f2b1a9cff 100644
--- 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 5c74b92855..e2ccc74a87 100644
--- 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;