s3: only include gen_ndr headers where needed.

This shrinks include/includes.h.gch by the size of 7 MB and reduces build time
as follows:

ccache build w/o patch
real    4m21.529s
ccache build with patch
real    3m6.402s

pch build w/o patch
real    4m26.318s
pch build with patch
real    3m6.932s

Guenther

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 3a9da2cc686e4ddcb7b82dd58d685fcc2475cbbb..82e8182ca31dd3adc485acbd6720f0978880c867 100644 (file)
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index 5e05f1b15b1d860e7e8ded6c21de88bdd01b8319..08dc4dc57e6d1ab3aabb4d519665dbbe8e825164 100644 (file)
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6b54001bb3eba204c8570eb610ee1ac7b5439b04..5b682bb4e31f674ca7b6f032d777bfda2f2fe232 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -648,7 +648,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "privileges.h"
 #include "rpc_misc.h"
 #include "rpc_dce.h"
-#include "../librpc/gen_ndr/schannel.h"
 #include "mapping.h"
 #include "passdb.h"
 #include "rpc_secdes.h"
@@ -666,10 +665,6 @@ struct ntlmssp_state;
 #include "ntdomain.h"
 #include "reg_objects.h"
 #include "reg_db.h"
-#include "librpc/gen_ndr/perfcount.h"
-#include "librpc/gen_ndr/notify.h"
-#include "librpc/gen_ndr/xattr.h"
-#include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/rpc/dcerpc.h"
 #include "nt_printing.h"

diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index 3dc3810998027c6d2f0361b455dc38f3de34313b..384eb22b20063f5d936fb6fab06f1aa0a3b38b28 100644 (file)
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -19,6 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "../librpc/gen_ndr/ntlmssp.h"
+
 /* NTLMSSP mode */
 enum ntlmssp_role
 {

diff --git a/source3/include/proto.h b/source3/include/proto.h
index eae3d283d9247001e37c0d7f57ddc603f671ca5a..9c169ed11c3b648acf4a6143d6ab8e7d2eed99e2 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2107,27 +2107,9 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
                                uint32_t flags);
 
 
-#include "librpc/gen_ndr/ndr_dfs.h"
-#include "librpc/gen_ndr/ndr_dssetup.h"
-#include "librpc/gen_ndr/ndr_echo.h"
 #include "librpc/gen_ndr/ndr_eventlog.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
-#include "librpc/gen_ndr/ndr_notify.h"
-#include "librpc/gen_ndr/ndr_ntsvcs.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-#include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
-#include "librpc/gen_ndr/ndr_wkssvc.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_spoolss.h"
-#include "librpc/gen_ndr/ndr_initshutdown.h"
-
-#include "librpc/ndr/libndr.h"
 
 /* The following definitions come from librpc/ndr/util.c  */
 

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 780d79acb39317fb72573f60822aaf17ff3cb77d..f8ec5d4983aa35ef501a6d02cc02bcd93a417f95 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -228,32 +228,9 @@ struct id_map {
        enum id_mapping status;
 };
 
-#include "librpc/gen_ndr/misc.h"
-#include "librpc/gen_ndr/security.h"
-#include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/lsa.h"
-#include "librpc/gen_ndr/dfs.h"
-#include "librpc/gen_ndr/winreg.h"
-#include "librpc/gen_ndr/initshutdown.h"
-#include "librpc/gen_ndr/eventlog.h"
-#include "librpc/gen_ndr/srvsvc.h"
-#include "librpc/gen_ndr/wkssvc.h"
-#include "librpc/gen_ndr/echo.h"
-#include "librpc/gen_ndr/svcctl.h"
-#include "librpc/gen_ndr/netlogon.h"
-#include "librpc/gen_ndr/samr.h"
-#include "librpc/gen_ndr/dssetup.h"
 #include "librpc/gen_ndr/epmapper.h"
-#include "librpc/gen_ndr/libnet_join.h"
 #include "librpc/gen_ndr/krb5pac.h"
-#include "librpc/gen_ndr/ntsvcs.h"
-#include "librpc/gen_ndr/nbt.h"
-#include "librpc/gen_ndr/drsuapi.h"
-#include "librpc/gen_ndr/drsblobs.h"
-#include "librpc/gen_ndr/spoolss.h"
 #include "librpc/gen_ndr/dcerpc.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
-#include "librpc/gen_ndr/ntlmssp.h"
 
 struct lsa_dom_info {
        bool valid;

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 83211dd5e6e2e7ef46f9f6a55198c9f35907ab4c..3edf9608ca105ecdc348ddb26ccc624f9b241633 100644 (file)
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /* -------------------------------------------------------------------------- **
  * Defines...

diff --git a/source3/lib/dmallocmsg.c b/source3/lib/dmallocmsg.c
index 935fc1de1ae369e5faacdbf10c3d3ac0d7de7754..59f7c3bd7e3ea761603b487b4305cd2a0ac063e1 100644 (file)
--- a/source3/lib/dmallocmsg.c
+++ b/source3/lib/dmallocmsg.c
@@ -17,6 +17,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /**
  * @file dmallocmsg.c

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 17260478865aa0edd8c01b2c08b9b68079e0863b..d7828e228f383270a9a1b78b50b7c0bd8ecd127a 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "g_lock.h"
+#include "librpc/gen_ndr/messaging.h"
 
 static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
                                    struct server_id pid);

diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 9af01cecfdd47c14e40eea183d453436ce8b2ff9..ee17672215676752e7909d7e4e1e273da6fcb3d4 100644 (file)
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -23,7 +23,6 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "libnet/libnet.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
 
 /********************************************************************

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index f537802d7877f801d860058f6955600cccc2659c..51932a5a920c5020d9802d4dd090d8dbe29e1eda 100644 (file)
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -23,7 +23,6 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "libnet/libnet.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /****************************************************************

diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index 3cfd118d21cb811c7e29f52fd172b845a473c29f..6cea757457028eb2eff3bf87098acd7aaf08597c 100644 (file)
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -17,6 +17,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /**
  * @file tallocmsg.c

diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c
index 6ada66ca40d9ccf1eb2a4d5eb8c8fddd71d055a5..9ee249fc8eed49bae7809360616eab70b9ddc92a 100644 (file)
--- a/source3/libads/ndr.c
+++ b/source3/libads/ndr.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r)
 {

diff --git a/source3/libnet/libnet_dssync.h b/source3/libnet/libnet_dssync.h
index a5a00742c583db4305cc442794990d52f1c15775..e05aaa374b92b8e38568bfb885f12694b81c9b35 100644 (file)
--- a/source3/libnet/libnet_dssync.h
+++ b/source3/libnet/libnet_dssync.h
@@ -18,6 +18,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../librpc/gen_ndr/drsuapi.h"
+#include "../librpc/gen_ndr/drsblobs.h"
+
 struct dssync_context;
 
 struct dssync_ops {

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 736a9191900c4afd570d1655e2a3bbaf3edf5e5f..5271c910ddafcf84766ca40f8aba1ee96aacf720 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -23,6 +23,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index bce57cec3a7f9cbdc5e9a03bf05aed316400f708..c8185f67bafed266d23c293f689cc8dfd1f02305 100644 (file)
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /*
  * cli_send_mailslot, send a mailslot for client code ...

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 8c50a0aa395ff72e34ea3605e44c7a6d721bab67..6cf7c9430dedf9aa6b41564a9552a164aebe631f 100644 (file)
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libads/sitename_cache.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #define DSGETDCNAME_FMT        "DSGETDCNAME/DOMAIN/%s"
 /* 15 minutes */

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index eb292da2ce60c1e2345e48e5db41f4e3561157f4..9784253cc2a2d4399898fe3e3e46fc8dde625e50 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -26,7 +26,7 @@
 #include "includes.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
-
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 /* 
  * Check a server for being alive and well.

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index cbdca4e748c032aa9996300fc0d369cac7ebe4c7..6a01aec9c53f9ba307132d3e6237da25900ce1ee 100644 (file)
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 
 /*

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index c7503ca43ca7b2ab5231693ef0a63aed8e9eb72b..ee0eaf5198bf59896359312fd4c440582ea0f34e 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -25,6 +25,7 @@
    used. This allows us to provide the same semantics as NT */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 3975a78673c6521e38333c7ab1706bc72bc6bb57..63bcff17acba76ae8916d560111a8b49136fab1d 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -36,6 +36,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 5dc021a54733bc87ca07cc5203854ae5a189cc9f..fa106a9499c505eb3860b2ee15c1e75fca5f0308 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 8d6bdc0b3e68005bf662011748528b2c9dad499c..33807f72ef87ac02087e3cddb40c61fdae44dd45 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "librpc/gen_ndr/messaging.h"
 
 static TALLOC_CTX *send_ctx;
 

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index da081304476740f1c42d1e68e1d0279d142b1602..d59e3c5ffd44d30a49cc51aa98e06c26e996d57e 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 static TDB_CONTEXT *tdb_forms; /* used for forms files */
 static TDB_CONTEXT *tdb_drivers; /* used for driver files */

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index e67c5d41a35de0b5e3f574a34bbc6fb73ab727de..b0f22c9b6f5bfd5d25c25a75f59d6a1115155e3d 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "librpc/gen_ndr/messaging.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;

diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index ff9e5db46c547c68bc9ce5b8a8a774c643f7d81a..57d92ff1327ad2ef978d692d1c150e5e48752c05 100644 (file)
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/perfcount.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 8d33d7713f40afc0c9028bde396f22ce54386a1e..e7c4ec197f7e086a33d331810b72c46c0fdcfa98 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -20,6 +20,22 @@
 #include "includes.h"
 #include "librpc/gen_ndr/cli_epmapper.h"
 #include "../librpc/gen_ndr/ndr_schannel.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_dssetup.h"
+#include "../librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_srvsvc.h"
+#include "../librpc/gen_ndr/ndr_wkssvc.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
+#include "../librpc/gen_ndr/ndr_dfs.h"
+#include "../librpc/gen_ndr/ndr_echo.h"
+#include "../librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_eventlog.h"
+#include "../librpc/gen_ndr/ndr_ntsvcs.h"
+#include "../librpc/gen_ndr/ndr_epmapper.h"
+#include "../librpc/gen_ndr/ndr_drsuapi.h"
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
 #include "smb_krb5.h"

diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c
index 4348fb8d4a7b115b15af60ec40a919120c90b887..f1ab77485905e1d18afbcc5d87c8d5fb9fa20842 100644 (file)
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 866d1715667948ce08e2aeb7fd4e2c117e8ee17b..fc1bdf0b2d39ead185a52a86c2b88b56c1340455 100644 (file)
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "../libcli/auth/schannel.h"
 #include "../librpc/gen_ndr/srv_netlogon.h"
+#include "librpc/gen_ndr/messaging.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index f96a147a27dd507f4f36217908c1926d46cfe35b..954212a8fc88904b5ac98d5750f3e0aab4ffdd44 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -29,6 +29,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_spoolss.h"
 #include "../librpc/gen_ndr/cli_spoolss.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,ic,info,level) \

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 0681ca30f72e72df8a12efaf83943c24f3e7299c..6d86074a54bac136156ce8c5a8d0c5e5e4994dfd 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_srvsvc.h"
+#include "librpc/gen_ndr/messaging.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/rpcclient/cmd_epmapper.c b/source3/rpcclient/cmd_epmapper.c
index 6159b4a0d14531ec783ce57586cdba1b1f4758a7..3ee012083836a6d02f5932b5e8d62325fc541ad8 100644 (file)
--- a/source3/rpcclient/cmd_epmapper.c
+++ b/source3/rpcclient/cmd_epmapper.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/cli_epmapper.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
                                 TALLOC_CTX *mem_ctx,

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index e24538b8044a2909984eeece7227601be5b1e402..d83fd17ae3bae90d474ef943122a6cfabccf0b0f 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -23,6 +23,7 @@
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 DOM_SID domain_sid;
 

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 9b20adfb89319273c91c6b386d79f6ffafc943e5..b50c4f48f2ffe2b6c35c6c197820c895a80f74cc 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

diff --git a/source3/smbd/change_trust_pw.c b/source3/smbd/change_trust_pw.c
index ec3046e0d2cc25dd755f3cc929d8a1e25b5b06b1..d02de7ae644aa1acb9e44ba16e72eadb05c88882 100644 (file)
--- a/source3/smbd/change_trust_pw.c
+++ b/source3/smbd/change_trust_pw.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 /************************************************************************
  Change the trust account password for a domain.

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index bf181f3bd06236a080d379adb3fdfc6d7bcca265..098edacb6d516bb936ff51b3e00e1d54f24fd38c 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /****************************************************************************
  Run a file if it is a magic script.

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 554591fc98c4b1c2282ca064fd220bfa54c81aa2..5df389fc20e2bef480f954de12dad0dfc14955fe 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/notify.h"
 
 struct notify_change_request {
        struct notify_change_request *prev, *next;

diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index b1d424d7f135ba295bb4d3a79392f96713ab1212..fe6436d28c0a397bb9475ca51bd16fd28bf4bb7e 100644 (file)
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/notify.h"
 
 #ifdef HAVE_INOTIFY
 

diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 22801e9d923abbc571443bc7194a4b9234f32d7f..020cb58a5c56143cee248ac420ee9479bb152870 100644 (file)
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_notify.h"
+#include "librpc/gen_ndr/messaging.h"
 
 struct notify_context {
        struct db_context *db_recursive;

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 19bd0c2d97e21c707143dd44b6145840b7725e31..62651b08adc047058df2f3aeb19142c5c028e706 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "librpc/gen_ndr/messaging.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index c22a58910463a4dc98dea0677d824ac28a5e64e9..d00bcba32a2caa04a744474be9a25d435d5e072c 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -22,6 +22,7 @@
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
 #include "smbd/globals.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /****************************************************************************
  Get the number of current exclusive oplocks.

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 53c5e0b4089665f68385bd43cbbd2ea51e75da2c..128a612a86281259b8019f77354008594ecc84d5 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -34,6 +34,7 @@
 #include "../librpc/gen_ndr/srv_svcctl.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
+#include "librpc/gen_ndr/messaging.h"
 
 extern bool global_machine_password_needs_changing;
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 49e2eda3cec1e4a93f6a68dd859c22d57fb494e8..5d4aca1bc5dfcabca662d61b69ef32abbf07c5f5 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "librpc/gen_ndr/messaging.h"
 
 static_decl_rpc;
 

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 8c0317ae9eb28afd1e8b57eab87a4f6752343f5f..a00a362537c073e7ca46005cabb136e8949d71a0 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -26,6 +26,7 @@
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
 #include "ntlmssp.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index cc53458a93c559f58fab29e18012f83f13c4243d..9e699159ff060f6753cdaa8728d6ce70f660224c 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "librpc/gen_ndr/messaging.h"
 
 struct smbd_smb2_lock_element {
        uint64_t offset;

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index db347b5b7e86755f0618027f04e3306772cd3786..88cb97e6a6d19bae23aae72327a539185d84936a 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 811a647ab340cef212a36f494edc2046aac1f5a5..9c2e3296e585949068255e2caca014b978d2a4ed 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -27,6 +27,7 @@
 #include "version.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/xattr.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index 0c4c96bd7612eaee1353c10778d3ae8007e3bc5b..dffc98775d355c04e7f4dfaaa2c67badcc34206a 100644 (file)
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 static int pong_count;
 

diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c
index c05a42465a1c4f62426a0695891282766ecdbe3f..89cc228f4771669a8772dde96f098d7dc2e73779 100644 (file)
--- a/source3/utils/net_dom.c
+++ b/source3/utils/net_dom.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_winreg.h"
 
 int net_dom_usage(struct net_context *c, int argc, const char **argv)
 {

diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 102f1b263f2020ddf8179c2fa081bb16b254ab92..25c781f2c4dc1a8478abab3f343c4093c627d5c6 100644 (file)
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "libads/sitename_cache.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 int net_lookup_usage(struct net_context *c, int argc, const char **argv)
 {

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index bb7d74b1991fc7b8c6f14a79dde0099bb748f203..71fcc0945c4c82889642e0e66880ef5ac8c452d6 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -23,6 +23,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 739818ddb5a00be06843559caf77d078d9875cd3..85bdc75cfbc5b5454a247d0c6cd8be8e27955df6 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -25,6 +25,8 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_drsuapi.h"
 
 static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx,
                                                      int argc,

diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index af219eb93c18ac35af3159f49d76245e5104d5ba..3fa219998b5be44e7854a322650c4bbdb69ee842 100644 (file)
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 /********************************************************
  Connection cachine struct. Goes away when ctx destroyed.

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 8dd2a36da47d22437b4f88f7665cd7654f5534cb..7db1f17b2284cac6e50c7f7a6e0b301fce8d4e6c 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index e97d5541799f69619c099ac5b56648475fcde171..9ddabc87574755b030f6eac8356eef882ebc0339 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index ef67ad77b42df8f129bc3a6124ff9f8d695fcc00..49a10e51372d0d578291935e70b3d14b7abaaafb 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 static char *server;
 

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 4d00269970ece66ab6fb854914a4fb8e7e485515..f651e6079b8c793db89116e07f322ed4641a9e6e 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 8a1456f407879af4f93cf1c6729c4c5ef1f38995..9715363f703c6535674615b66be94445b0aa224f 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -66,6 +66,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "../librpc/gen_ndr/cli_dssetup.h"
 #include "libads/sitename_cache.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 4f314cf59f59ab5dd86a1c3cd06922d51f717765..c622b3ccc2521a90ee6761eb968cb391d9969570 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -30,6 +30,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 80a071103ace67f179298cc797ff626f569526f5..9ab44f0cad99063abfb91a2ddf173d464f77522c 100644 (file)
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index b062fd1d77c682c10b88a9276d4a2324f91f35db..a0254331213f6d8258fdaf38cffbb6a2d2ceda76 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -26,6 +26,7 @@
 #include "winbindd.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "smb_krb5.h"
 
 #undef DBGC_CLASS