From 8e16d6dbdfdbfd42de32497d92f3fae32cd39ba4 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 26 Aug 2010 10:14:07 +0200
Subject: s3-build: only include ctdbd_conn.h where needed.

Guenther
---
 source3/include/includes.h | 1 -
 source3/lib/ctdbd_conn.c   | 1 +
 source3/lib/g_lock.c       | 1 +
 source3/lib/util.c         | 1 +
 source3/smbd/process.c     | 1 +
 source3/smbd/server.c      | 1 +
 6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7e3c381731..b185ce261d 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 ff286148eb..e0682f3a74 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 6e4c6d796c..edb77869cc 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 fab622b4e1..28336512df 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 434f52889b..b890687425 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 247cbb84d5..e2edaf3a3c 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"
-- 
cgit