s3: only use netlogon/nbt header when needed.

Guenther

3 files changed, 2 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  */