s3-netlogon: remove global include of netlogon.h.

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

Guenther

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 0cccab51fd93b593522b5fe734755ff0ef5b64ab..c212bb39d403a41538c3a0c269303cec3aefd185 100644 (file)
--- 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 782dc410e08f1c57f4f93ae02c7bd20f24f8d45d..e457bd4ae7e95c086cf2880919665ddb76489ffc 100644 (file)
--- 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 7634e76f1c98148ce163ca28c059662a6ef3b2cc..21d9af1f54643dd1eeeaa6b60f7764597b830426 100644 (file)
--- 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 32340b3d661d5caab23d27f93de804ecc7ef4bb8..7e56f7db228e8a83423cd25c0d9292714fac6f83 100644 (file)
--- 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 2eb13d423e32e8e25e2414f98203f2638288725a..d4e37fe85dc05caf02a4b8d7847cf631315e5bd5 100644 (file)
--- 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 ee17672215676752e7909d7e4e1e273da6fcb3d4..787b258db924f0773a90963a2b0e5eaa89dce0b1 100644 (file)
--- 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 13a06c7136c97b7d8637802648c88195f73d0809..89a7c93d5e2123df86715d73f04469576a7bf152 100644 (file)
--- 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 54b97090cdeeda5c8476796cb84c634b52a40120..d58b7ccf67ffb034ea6ccf799de548794fab8e0e 100644 (file)
--- 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 74b38de2a40b3f5996710322db3d47f0b33f21c9..31a4c06c24d736404afdd92bab724f8f9131964b 100644 (file)
--- 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 d7ae3976bfcf462c10615a3274e2a49c5747de68..3d5ea9630c35ed40b33625660f9738203aa51c95 100644 (file)
--- 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 9c665c81a045558f9d06b8040fbe8b900ad50fa4..23ca1496bf8348dc8b007d0b37446cba711d2fe6 100644 (file)
--- 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 3cd1f9dc804a825763949e810c9b622f1bd5f142..c6f2836763b6ec89823c92e8efe936c5e7384173 100644 (file)
--- 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 57d483fa46bd4491be3fa13850a133d979bee54c..3cafdc7d379bb6716dfc1df703dfcd3a9a4d562b 100644 (file)
--- 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 b11e7eea28c7fa2949eb165dd76ca4655b4e87bd..28b21b6bf6964071a4439208c17ee06bc86bc2ff 100644 (file)
--- 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 9ead42df5b6b11b148fc02621305adbc77d241de..ae44d5760fa4ad7b641f37d61bc8609447f050d1 100644 (file)
--- 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 a2737105c4e0698ced30fe39745920bada419f47..0412d755a90396a9ea65191802972eb1113b1dae 100644 (file)
--- 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 68fc2b18f38f5debca425e2581e44d897975760c..1a0ddb1892927c102e4b1bf23c20a1af7bb689f7 100644 (file)
--- 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 7ada5fdb9a366e9343a9cc3728ab1e6b0e2340aa..d33801e129dbc44b4db72591344666180daa5246 100644 (file)
--- 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 996417b51ec79118d8ddf4a0cdb7f770e9908b15..f0989e6ac79b5eefe2f3c18545de14e6a1c7022e 100644 (file)
--- 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 ddd5ae2449e9ed5f03ec1a2afca85021ca088a45..9a345476dcbfd1864144d8f0730d26d2a84af24a 100644 (file)
--- 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 aecce4102155bed4b1faf98891f316734d137cdd..c7c216b66f9d72fe1cd627142bb68e2db2e99e4a 100644 (file)
--- 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;