From 0f8e032628865861b356755b4fbafb6fbfeddbeb Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Thu, 5 Aug 2010 15:14:04 +0200
Subject: [PATCH] s3-netlogon: remove global include of netlogon.h.

This reduces precompiled headers by another 4 MB and also slightly speeds up the
build.

Guenther
---
 source3/auth/auth_ntlmssp.c                | 1 +
 source3/auth/server_info.c                 | 1 +
 source3/auth/token_util.c                  | 2 ++
 source3/include/proto.h                    | 6 ++++++
 source3/include/smb.h                      | 1 -
 source3/lib/netapi/getdc.c                 | 2 +-
 source3/lib/netapi/joindomain.c            | 2 +-
 source3/lib/netapi/netlogon.c              | 2 +-
 source3/lib/util_sid.c                     | 1 +
 source3/modules/vfs_expand_msdfs.c         | 1 +
 source3/modules/vfs_full_audit.c           | 1 +
 source3/modules/vfs_recycle.c              | 1 +
 source3/modules/vfs_smb_traffic_analyzer.c | 1 +
 source3/modules/vfs_xattr_tdb.c            | 1 +
 source3/printing/nt_printing.c             | 1 +
 source3/printing/printing.c                | 1 +
 source3/rpc_server/srv_lsa_nt.c            | 1 +
 source3/rpc_server/srv_spoolss_nt.c        | 1 +
 source3/smbd/password.c                    | 1 +
 source3/smbd/service.c                     | 1 +
 source3/smbd/uid.c                         | 1 +
 21 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 0cccab51fd9..c212bb39d40 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../libcli/auth/ntlmssp.h"
 #include "ntlmssp_wrap.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 NTSTATUS auth_ntlmssp_steal_server_info(TALLOC_CTX *mem_ctx,
 				struct auth_ntlmssp_state *auth_ntlmssp_state,
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 782dc410e08..e457bd4ae7e 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../lib/crypto/arcfour.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 7634e76f1c9..21d9af1f546 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -27,6 +27,8 @@
 #include "includes.h"
 #include "secrets.h"
 
+#include "../librpc/gen_ndr/netlogon.h"
+
 /****************************************************************************
  Check for a SID in an NT_USER_TOKEN
 ****************************************************************************/
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 32340b3d661..7e56f7db228 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -180,6 +180,10 @@ NTSTATUS auth_winbind_init(void);
 
 /* The following definitions come from auth/server_info.c  */
 
+struct netr_SamInfo2;
+struct netr_SamInfo3;
+struct netr_SamInfo6;
+
 struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx);
 NTSTATUS serverinfo_to_SamInfo2(struct auth_serversupplied_info *server_info,
 				uint8_t *pipe_session_key,
@@ -2728,6 +2732,8 @@ NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
 
 /* The following definitions come from libsmb/dsgetdcname.c  */
 
+struct netr_DsRGetDCNameInfo;
+
 void debug_dsdcinfo_flags(int lvl, uint32_t flags);
 NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
 		     struct messaging_context *msg_ctx,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2eb13d423e3..d4e37fe85dc 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -178,7 +178,6 @@ typedef union unid_t {
 
 #include "librpc/gen_ndr/idmap.h"
 #include "librpc/gen_ndr/epmapper.h"
-#include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/dcerpc.h"
 
 struct lsa_dom_info {
diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index ee176722156..787b258db92 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -19,11 +19,11 @@
 
 #include "includes.h"
 
+#include "../librpc/gen_ndr/cli_netlogon.h"
 #include "librpc/gen_ndr/libnetapi.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "../librpc/gen_ndr/cli_netlogon.h"
 
 /********************************************************************
 ********************************************************************/
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 13a06c7136c..89a7c93d5e2 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -20,12 +20,12 @@
 #include "includes.h"
 #include "ads.h"
 #include "librpc/gen_ndr/libnetapi.h"
+#include "libcli/auth/libcli_auth.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
 #include "librpc/gen_ndr/libnet_join.h"
 #include "libnet/libnet_join.h"
-#include "libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_wkssvc.h"
 #include "secrets.h"
 
diff --git a/source3/lib/netapi/netlogon.c b/source3/lib/netapi/netlogon.c
index 54b97090cde..d58b7ccf67f 100644
--- a/source3/lib/netapi/netlogon.c
+++ b/source3/lib/netapi/netlogon.c
@@ -19,11 +19,11 @@
 
 #include "includes.h"
 
+#include "../librpc/gen_ndr/cli_netlogon.h"
 #include "librpc/gen_ndr/libnetapi.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "../librpc/gen_ndr/cli_netlogon.h"
 
 static WERROR construct_data(enum netr_LogonControlCode function_code,
 			     const uint8_t *data_in,
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 74b38de2a40..31a4c06c24d 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/dom_sid.h"
 
 /*
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index d7ae3976bfc..3d5ea9630c3 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 9c665c81a04..23ca1496bf8 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -58,6 +58,7 @@
 
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 static int vfs_full_audit_debug_level = DBGC_VFS;
 
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 3cd1f9dc804..c6f2836763b 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #define ALLOC_CHECK(ptr, label) do { if ((ptr) == NULL) { DEBUG(0, ("recycle.bin: out of memory!\n")); errno = ENOMEM; goto label; } } while(0)
 
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 57d483fa46b..3cafdc7d379 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -24,6 +24,7 @@
 #include "vfs_smb_traffic_analyzer.h"
 #include "../libcli/security/dom_sid.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 /* abstraction for the send_over_network function */
 enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index b11e7eea28c..28b21b6bf69 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 9ead42df5b6..ae44d5760fa 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -31,6 +31,7 @@
 #include "rpc_server/srv_spoolss_util.h"
 #include "nt_printing.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 /* Map generic permissions to printer object specific permissions */
 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index a2737105c4e..0412d755a90 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "nt_printing.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 68fc2b18f38..1a0ddb18929 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -31,6 +31,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 7ada5fdb9a3..d33801e129d 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -39,6 +39,7 @@
 #include "registry/reg_objects.h"
 #include "include/printing.h"
 #include "secrets.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 996417b51ec..f0989e6ac79 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 /* Fix up prototypes for OSX 10.4, where they're missing */
 #ifndef HAVE_SETNETGRENT_PROTOTYPE
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ddd5ae2449e..9a345476dcb 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index aecce410215..c7c216b66f9 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/netlogon.h"
 
 /* what user is current? */
 extern struct current_user current_user;
-- 
2.34.1