From aba1bf4b5e1bf82f769c3c545578414202c74106 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Wed, 18 Aug 2010 12:24:35 +0200
Subject: [PATCH] s3-build: only include memcache.h where needed.

Guenther
---
 source3/auth/token_util.c      | 1 +
 source3/include/includes.h     | 1 -
 source3/lib/access.c           | 1 +
 source3/lib/util_pw.c          | 1 +
 source3/lib/util_sock.c        | 1 +
 source3/passdb/lookup_sid.c    | 1 +
 source3/passdb/pdb_interface.c | 1 +
 source3/smbd/globals.c         | 1 +
 source3/smbd/mangle_hash2.c    | 1 +
 source3/smbd/server.c          | 1 +
 source3/smbd/statcache.c       | 1 +
 source3/smbd/vfs.c             | 1 +
 source3/torture/torture.c      | 1 +
 13 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 21d9af1f546..8f66171e407 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "secrets.h"
+#include "memcache.h"
 
 #include "../librpc/gen_ndr/netlogon.h"
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 64b4a77fd23..dd802605e68 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -664,7 +664,6 @@ struct ntlmssp_state;
 #include "packet.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
-#include "memcache.h"
 #include "serverid.h"
 #include "async_smb.h"
 #include "../lib/async_req/async_sock.h"
diff --git a/source3/lib/access.c b/source3/lib/access.c
index 1293dc024e6..b674144150a 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -11,6 +11,7 @@
 */
 
 #include "includes.h"
+#include "memcache.h"
 
 #define NAME_INDEX 0
 #define ADDR_INDEX 1
diff --git a/source3/lib/util_pw.c b/source3/lib/util_pw.c
index b0baa12c3e5..4d4041cd5fd 100644
--- a/source3/lib/util_pw.c
+++ b/source3/lib/util_pw.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "memcache.h"
 
 struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from) 
 {
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index e9626f31fe1..46926f62987 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "memcache.h"
 
 /****************************************************************************
  Get a port number in host byte order from a sockaddr_storage.
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 0ec1f420f92..a93145330b2 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "secrets.h"
+#include "memcache.h"
 
 /*****************************************************************
  Dissect a user-provided name into domain, name, sid and type.
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index b11fab45081..3c297b2300b 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/samr.h"
+#include "memcache.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 1c7afb948eb..87d6405ee96 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "memcache.h"
 
 #if defined(WITH_AIO)
 struct aio_extra *aio_list_head = NULL;
diff --git a/source3/smbd/mangle_hash2.c b/source3/smbd/mangle_hash2.c
index 298f348661d..7c85a413cb9 100644
--- a/source3/smbd/mangle_hash2.c
+++ b/source3/smbd/mangle_hash2.c
@@ -65,6 +65,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "memcache.h"
 
 #if 1
 #define M_DEBUG(level, x) DEBUG(level, x)
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 0f43022dd81..3797ae93da9 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -28,6 +28,7 @@
 #include "registry.h"
 #include "libcli/auth/schannel.h"
 #include "secrets.h"
+#include "memcache.h"
 
 #include "../librpc/gen_ndr/srv_dfs.h"
 #include "../librpc/gen_ndr/srv_dssetup.h"
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index cea27d442ca..ecadbdcdd40 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "memcache.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index b75d4d1ffd5..d561a6b94fb 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "memcache.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 0e3ee18a373..2e35a1ff5da 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -25,6 +25,7 @@
 #include "tldap.h"
 #include "tldap_util.h"
 #include "../librpc/gen_ndr/svcctl.h"
+#include "memcache.h"
 
 extern char *optarg;
 extern int optind;
-- 
2.34.1