s3-build: only include ctdbd_conn.h where needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7e3c381731fbeed0069b2a4780dce1cf3aaaf126..b185ce261d5252a4ddd20521e14026e2c77be362 100644 (file)
--- 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 ff286148eb4c9d0430552571a54daec73026a0ca..e0682f3a7412a8bbbdb912541cad3f8342712ff3 100644 (file)
--- 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 6e4c6d796c7b49eada633d325e7b8b56d5e727c3..edb77869cc0b784fb9274d2f8b0b8fdadd50ea88 100644 (file)
--- 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 fab622b4e14f89756ce5d26b415fc1d5ca19037a..28336512df9ec24f4a0026eae1937086ed9c3e23 100644 (file)
--- 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 434f52889b7245df84282b27ccf1caea30845900..b890687425248c6e33aca425e8f143e4318f871b 100644 (file)
--- 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 247cbb84d565feba88e10d2b32d264c4f28ed296..e2edaf3a3c0d89d8eb29b878f113e53be6a17b1c 100644 (file)
--- 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"