summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-08-26 10:14:07 +0200
committerGünther Deschner <gd@samba.org>2010-09-20 13:54:50 -0700
commit8e16d6dbdfdbfd42de32497d92f3fae32cd39ba4 (patch)
tree25f9908c2970526090070bd5f1b92534983e537b
parentc7fe04abc791dd1b3c5272a96fb5f26f6ce5c252 (diff)
downloadsamba-8e16d6dbdfdbfd42de32497d92f3fae32cd39ba4.tar.gz
samba-8e16d6dbdfdbfd42de32497d92f3fae32cd39ba4.tar.xz
samba-8e16d6dbdfdbfd42de32497d92f3fae32cd39ba4.zip
s3-build: only include ctdbd_conn.h where needed.
Guenther
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/lib/ctdbd_conn.c1
-rw-r--r--source3/lib/g_lock.c1
-rw-r--r--source3/lib/util.c1
-rw-r--r--source3/smbd/process.c1
-rw-r--r--source3/smbd/server.c1
6 files changed, 5 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7e3c381731f..b185ce261d5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -653,7 +653,6 @@ extern void *cmdline_lp_ctx;
#include "session.h"
#include "module.h"
#include "packet.h"
-#include "ctdbd_conn.h"
#include "../lib/util/talloc_stack.h"
#include "serverid.h"
#include "../lib/util/smb_threads.h"
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index ff286148eb4..e0682f3a741 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -24,6 +24,7 @@
#include "librpc/gen_ndr/messaging.h"
#include "librpc/gen_ndr/ndr_messaging.h"
+#include "ctdbd_conn.h"
/* paths to these include files come from --with-ctdb= in configure */
#include "ctdb.h"
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 6e4c6d796c7..edb77869cc0 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "g_lock.h"
#include "librpc/gen_ndr/messaging.h"
+#include "ctdbd_conn.h"
static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
struct server_id pid);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index fab622b4e14..28336512df9 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "popt_common.h"
#include "secrets.h"
+#include "ctdbd_conn.h"
extern char *global_clobber_region_function;
extern unsigned int global_clobber_region_line;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 434f52889b7..b8906874252 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -23,6 +23,7 @@
#include "librpc/gen_ndr/netlogon.h"
#include "librpc/gen_ndr/messaging.h"
#include "../lib/async_req/async_sock.h"
+#include "ctdbd_conn.h"
extern bool global_machine_password_needs_changing;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 247cbb84d56..e2edaf3a3c0 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -29,6 +29,7 @@
#include "libcli/auth/schannel.h"
#include "secrets.h"
#include "memcache.h"
+#include "ctdbd_conn.h"
#include "../librpc/gen_ndr/srv_dfs.h"
#include "../librpc/gen_ndr/srv_dssetup.h"