s3: only use netlogon/nbt header when needed.

Guenther

14 files changed, 40 insertions, 26 deletions

diff --git a/source3/include/client.h b/source3/include/client.h
index 71232b35fa..c245f55165 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -22,6 +22,8 @@
 #ifndef _CLIENT_H
 #define _CLIENT_H
 
+#include "../librpc/ndr/libndr.h"
+
 /* the client asks for a smaller buffer to save ram and also to get more
    overlap on the wire. This size gives us a nice read/write size, which
    will be a multiple of the page size on almost any system */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index be3b66fe24..de1d419544 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -656,7 +656,6 @@ struct ntlmssp_state;
 
 #include "auth.h"
 #include "ntdomain.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/rpc/dcerpc.h"
 #include "nt_printing.h"
 #include "idmap.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5589eeee9c..ee6f09a729 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1759,17 +1759,6 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 			     const char *impersonate_princ_s,
 			     struct PAC_LOGON_INFO **logon_info);
 
-/* The following definitions come from libads/cldap.c  */
-bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
-			const char *server,
-			const char *realm,
-			uint32_t nt_version,
-			struct netlogon_samlogon_response **reply);
-bool ads_cldap_netlogon_5(TALLOC_CTX *mem_ctx,
-			  const char *server,
-			  const char *realm,
-			  struct NETLOGON_SAM_LOGON_RESPONSE_EX *reply5);
-
 /* The following definitions come from libads/disp_sec.c  */
 
 void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_descriptor *sd);
@@ -2176,20 +2165,6 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
 			const char *username,
 			const char *password,
 			const char *domain);
-/* The following definitions come from libsmb/clidgram.c  */
-
-bool send_getdc_request(TALLOC_CTX *mem_ctx,
-			struct messaging_context *msg_ctx,
-			struct sockaddr_storage *dc_ss,
-			const char *domain_name,
-			const struct dom_sid *sid,
-			uint32_t nt_version);
-bool receive_getdc_response(TALLOC_CTX *mem_ctx,
-			    struct sockaddr_storage *dc_ss,
-			    const char *domain_name,
-			    uint32_t *nt_version,
-			    const char **dc_name,
-			    struct netlogon_samlogon_response **reply);
 
 /* The following definitions come from libsmb/clientgen.c  */
 
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index db5f664d94..5d2e900c05 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../libcli/cldap/cldap.h"
 #include "../lib/tsocket/tsocket.h"
+#include "libads/cldap.h"
 
 /*******************************************************************
   do a cldap netlogon query.  Always 389/udp
diff --git a/source3/libads/cldap.h b/source3/libads/cldap.h
new file mode 100644
index 0000000000..afe4b35b5d
--- /dev/null
+++ b/source3/libads/cldap.h
@@ -0,0 +1,12 @@
+#include "../libcli/netlogon.h"
+
+/* The following definitions come from libads/cldap.c  */
+bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
+			const char *server,
+			const char *realm,
+			uint32_t nt_version,
+			struct netlogon_samlogon_response **reply);
+bool ads_cldap_netlogon_5(TALLOC_CTX *mem_ctx,
+			  const char *server,
+			  const char *realm,
+			  struct NETLOGON_SAM_LOGON_RESPONSE_EX *reply5);
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 8d4b86c8b2..98da8ff484 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "libads/sitename_cache.h"
+#include "libads/cldap.h"
 
 #ifdef HAVE_LDAP
 
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 1b72e33303..f1f0bcb357 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "libsmb/clidgram.h"
 
 /*
  * cli_send_mailslot, send a mailslot for client code ...
diff --git a/source3/libsmb/clidgram.h b/source3/libsmb/clidgram.h
new file mode 100644
index 0000000000..ff98f3b967
--- /dev/null
+++ b/source3/libsmb/clidgram.h
@@ -0,0 +1,16 @@
+#include "../libcli/netlogon.h"
+
+/* The following definitions come from libsmb/clidgram.c  */
+
+bool send_getdc_request(TALLOC_CTX *mem_ctx,
+			struct messaging_context *msg_ctx,
+			struct sockaddr_storage *dc_ss,
+			const char *domain_name,
+			const struct dom_sid *sid,
+			uint32_t nt_version);
+bool receive_getdc_response(TALLOC_CTX *mem_ctx,
+			    struct sockaddr_storage *dc_ss,
+			    const char *domain_name,
+			    uint32_t *nt_version,
+			    const char **dc_name,
+			    struct netlogon_samlogon_response **reply);
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 6e322e90c9..6af2eeb696 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -23,6 +23,8 @@
 #include "includes.h"
 #include "libads/sitename_cache.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "libads/cldap.h"
+#include "libsmb/clidgram.h"
 
 #define DSGETDCNAME_FMT	"DSGETDCNAME/DOMAIN/%s"
 /* 15 minutes */
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index a77f5e4b46..20ba3410d5 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libads/sitename_cache.h"
+#include "../libcli/netlogon.h"
 
 /* nmbd.c sets this to True. */
 bool global_in_nmbd = False;
diff --git a/source3/nmbd/nmbd_lmhosts.c b/source3/nmbd/nmbd_lmhosts.c
index 75c03bb398..227d7a3c8d 100644
--- a/source3/nmbd/nmbd_lmhosts.c
+++ b/source3/nmbd/nmbd_lmhosts.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "../libcli/nbt/libnbt.h"
 
 /****************************************************************************
 Load a lmhosts file.
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 9665a3aa86..4aea9a7ab4 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "libads/cldap.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/winbindd/idmap_adex/gc_util.c b/source3/winbindd/idmap_adex/gc_util.c
index 634fd980e8..9b4ce77b00 100644
--- a/source3/winbindd/idmap_adex/gc_util.c
+++ b/source3/winbindd/idmap_adex/gc_util.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "idmap_adex.h"
+#include "libads/cldap.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 64dd69069c..19b73bceb7 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -69,6 +69,7 @@
 #include "../librpc/gen_ndr/cli_dssetup.h"
 #include "libads/sitename_cache.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "libsmb/clidgram.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND