s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba.

Guenther

diff --git a/source3/client/client.c b/source3/client/client.c
index 6773e6d90a795213a19eba57ddc5718a5eaed40f..ca2f9a88421903f2f0bd2d6d0c9110ec1600982c 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -23,7 +23,8 @@
 
 #include "includes.h"
 #include "client/client_proto.h"
-#include "include/rpc_client.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
+
 #ifndef REGISTER
 #define REGISTER 0
 #endif

diff --git a/source3/include/includes.h b/source3/include/includes.h
index cbf30d6158b4c60d551c9aa40dbc4561130023c3..438b3464459df5ed467e0291fef9a2d297b10b3a 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -687,7 +687,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "mangle.h"
 #include "module.h"
 #include "nsswitch/winbind_client.h"
-#include "rpc_client.h"
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index bbe653b8bd5056f4cbb3b0ab113473a3c429b3c5..3204e2e64b50cd645c55ed5d68a1ac68c52acddf 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -28,6 +28,8 @@
  * in the NTDOM branch - it didn't belong there.
  */
 
+#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
+
 typedef struct _prs_struct {
        bool io; /* parsing in or out of data stream */
        /* 

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6b68f954e4a006968253b6a512c222ac642f13df..9e0f3a28df4e5214e51fa7c943364fabbd5fe34c 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2089,21 +2089,9 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
 #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/srv_dfs.h"
-#include "librpc/gen_ndr/srv_dssetup.h"
-#include "librpc/gen_ndr/srv_echo.h"
-#include "librpc/gen_ndr/srv_eventlog.h"
-#include "librpc/gen_ndr/srv_initshutdown.h"
-#include "librpc/gen_ndr/srv_lsa.h"
-#include "librpc/gen_ndr/srv_netlogon.h"
-#include "librpc/gen_ndr/srv_ntsvcs.h"
-#include "librpc/gen_ndr/srv_samr.h"
-#include "librpc/gen_ndr/srv_srvsvc.h"
-#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/srv_spoolss.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"
 

diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
deleted file mode 100644 (file)
index 84ac8b1..0000000
--- a/source3/include/rpc_client.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Gerald (Jerry) Carter         2005.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _RPC_CLIENT_H
-#define _RPC_CLIENT_H
-
-/* autogenerated client stubs */
-
-#include "librpc/gen_ndr/cli_echo.h"
-#include "librpc/gen_ndr/cli_lsa.h"
-#include "librpc/gen_ndr/cli_svcctl.h"
-#include "librpc/gen_ndr/cli_wkssvc.h"
-#include "librpc/gen_ndr/cli_eventlog.h"
-#include "librpc/gen_ndr/cli_dfs.h"
-#include "librpc/gen_ndr/cli_initshutdown.h"
-#include "librpc/gen_ndr/cli_winreg.h"
-#include "librpc/gen_ndr/cli_srvsvc.h"
-#include "librpc/gen_ndr/cli_samr.h"
-#include "librpc/gen_ndr/cli_netlogon.h"
-#include "librpc/gen_ndr/cli_dssetup.h"
-#include "librpc/gen_ndr/cli_ntsvcs.h"
-#include "librpc/gen_ndr/cli_epmapper.h"
-#include "librpc/gen_ndr/cli_drsuapi.h"
-#include "librpc/gen_ndr/cli_spoolss.h"
-
-#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
-
-#endif /* _RPC_CLIENT_H */

diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 0d1bc08ad30215a61cc41992f431ba02650cd123..1c3ef6d78f150bc83b8353f1926a8859fe069781 100644 (file)
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index d3f58f6684967f311b5f2a764627cff2ec393fde..9af01cecfdd47c14e40eea183d453436ce8b2ff9 100644 (file)
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -24,6 +24,7 @@
 #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/group.c b/source3/lib/netapi/group.c
index 77ed2e84854377e45c5d71ca08e077ba1d2bf044..e707c0c6333a09f438759864215cf0f61b87e435 100644 (file)
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 9970a0655a383b8fc29dbb6b40cc2eaf6b67b7f1..4936d772cdaa17bb149a827f453865038a3e9ccd 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -25,6 +25,7 @@
 #include "lib/netapi/libnetapi.h"
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_wkssvc.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index d389c1f4a2b44aa6ea5227e2ff6a50a78475e7c7..b9c0b4c3257796cb9614a64b171469f9941b4488 100644 (file)
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -23,6 +23,8 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 static NTSTATUS libnetapi_samr_lookup_and_open_alias(TALLOC_CTX *mem_ctx,
                                                     struct rpc_pipe_client *pipe_cli,

diff --git a/source3/lib/netapi/netlogon.c b/source3/lib/netapi/netlogon.c
index 082938cadc4e23ac8506e0a6999da9aa279a121c..54b97090cdeeda5c8476796cb84c634b52a40120 100644 (file)
--- a/source3/lib/netapi/netlogon.c
+++ b/source3/lib/netapi/netlogon.c
@@ -23,6 +23,7 @@
 #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/netapi/samr.c b/source3/lib/netapi/samr.c
index dbcef38dc7eecdb5e6e95c8bd4d53c12afa78f4f..bef02c4469ca268a5acc88026d3e6e7f0e0b1b36 100644 (file)
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index cc2ff52ab5e698cadd323009d394fbf4c8b1fd0b..f537802d7877f801d860058f6955600cccc2659c 100644 (file)
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -24,6 +24,7 @@
 #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/netapi/share.c b/source3/lib/netapi/share.c
index 84c275248da6424dfb2cb0a2fcd1bc70aa348192..65bcd9a3a26f65f7c10f303d282bd32c32354ab1 100644 (file)
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/netapi/shutdown.c b/source3/lib/netapi/shutdown.c
index f9eb93b125929103e441b3b82c880f7db6902f86..4c274d6e8bf213eb29031386d9273167c9a52dfe 100644 (file)
--- a/source3/lib/netapi/shutdown.c
+++ b/source3/lib/netapi/shutdown.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_initshutdown.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index f95750fae7bd35d4d5fce79a0be998c22caae7f6..1ad4a6f282a090e07121d1f62e24083f579ffc00 100644 (file)
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index a5290292a5d9899cdc992fc43004790a0c69075c..b5a3e6ba43de13e9ae84cb8661f5aea2b5b52706 100644 (file)
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
 
 #ifdef HAVE_ADS
 

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index 0b61b162c05471dfadcaada29b6d6f6794cb7f36..5213be05872e524e416b39483c4c308ce06600fc 100644 (file)
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "../libcli/drsuapi/drsuapi.h"
+#include "../librpc/gen_ndr/cli_drsuapi.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index aa5f54adaf6035fd7bcfb3934c1a102ee51fc4c8..736a9191900c4afd570d1655e2a3bbaf3edf5e5f 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -21,6 +21,8 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index df7e875ab64d6161609fc244cde6679fb5d8fee0..26ecdc52ea2828e49d2792adc4ce0c71e7190682 100644 (file)
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -26,6 +26,7 @@
 #include "../lib/crypto/crypto.h"
 #include "../libcli/samsync/samsync.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 /**
  * Fix up the delta, dealing with encryption issues so that the final

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 73bbf82861e342692a930c478d99807dc845ee08..6c0b1b4e28b750900a7d2bb28cda10c651a31890 100644 (file)
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
-
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /*
  * Routine to open a directory

diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index e127c9a67be4f613d7573d8ec8701668eab6b434..8acdc0fa59ba2bfa6824bc20308c874ebc2bc4d2 100644 (file)
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 /*********************************************************
  Change the domain password on the PDC.

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 74fd08276c35e45b67bcff2fe7bdd5d01dbd660e..caa258398ae07569a0ffa7c1ce1daac322293474 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 /** @defgroup lsa LSA - Local Security Architecture
  *  @ingroup rpc_client

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 191a0b0126ed00ed4ded38d887d8e00339cfec80..03884479f9f08d77980030f7b2c2573ff1d5663a 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 /****************************************************************************
  Wrapper function that uses the auth and auth2 calls to set up a NETLOGON

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index df22ecb2844537a880dd97fa99ed5d5584b92e99..21cc2f6268bc8a9790502963acc1cda6319b2096 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 /* User change password */
 

diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 6d6d5dfcfab48746b67056b7b0e30e74ac285453..a4622d07cfd3f4e57d4f4084c68df037b89e7d6e 100644 (file)
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "rpc_client.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
 
 /**********************************************************************
  convencience wrapper around rpccli_spoolss_OpenPrinterEx

diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
index bef8d83103901ff468cfa38eb9f2d2d55712c298..dfa33c25a910040cd19ed4c85329d08a14eabb97 100644 (file)
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -22,6 +22,7 @@
 /* This is the implementation of the dfs pipe. */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_dfs.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_MSDFS

diff --git a/source3/rpc_server/srv_dssetup_nt.c b/source3/rpc_server/srv_dssetup_nt.c
index 2b18e6b2aeb914143cec45251f708a8a349dbcf2..148e182a4dd99ed1a76df7084b156ba08fe94965 100644 (file)
--- a/source3/rpc_server/srv_dssetup_nt.c
+++ b/source3/rpc_server/srv_dssetup_nt.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_dssetup.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/srv_echo_nt.c
index bf29766e607eb4c1ae6c374801221f9838b32bf7..248ca0bf2abadb5e199a14b411284d1d7f1b148e 100644 (file)
--- a/source3/rpc_server/srv_echo_nt.c
+++ b/source3/rpc_server/srv_echo_nt.c
@@ -22,6 +22,7 @@
 /* This is the interface to the rpcecho pipe. */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_echo.h"
 
 #ifdef DEVELOPER
 

diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c
index 8e3922d2464991b327191b033296242aa4c812dd..52ecc8911223e5ae44a6cf5c55834d24cc4142a1 100644 (file)
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_eventlog.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/srv_initshutdown_nt.c
index 8b3ef522939463e6ac68f6188e288addc9a5495f..0425f8286597cc89ef5189ade1006ee2aec9bb02 100644 (file)
--- a/source3/rpc_server/srv_initshutdown_nt.c
+++ b/source3/rpc_server/srv_initshutdown_nt.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "regfio.h"
+#include "../librpc/gen_ndr/srv_initshutdown.h"
+#include "../librpc/gen_ndr/srv_winreg.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 08d69119fdb2fb9422b497e05395f234cf5a9c96..e903f0e974e3502a5b1797c771ebb576631eccbe 100644 (file)
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -29,6 +29,7 @@
 /* This is the implementation of the lsa server code. */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_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 39912ac7e40694ef7b454cbb757be26856b45c47..7854c448f879e6de15d71312b21b3b45557c816f 100644 (file)
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -28,6 +28,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/schannel_state.h"
 #include "../libcli/auth/schannel.h"
+#include "../librpc/gen_ndr/srv_netlogon.h"
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index 357478f274dba0a62f07b8364755f8279f5ef05f..ec0c884acf3ac5f62791740dd931a7f35783c07b 100644 (file)
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/srv_ntsvcs_nt.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_ntsvcs.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3ba24e8038106145585f4eca73fac4d0f0745d9e..2bfd6c3a8990a6ef52a42b6732395b1ad8261c41 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -34,6 +34,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/srv_samr.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 55fc1c170de4a31adfdd66cb3b4edf4424a13685..a40bb02971298b2da52b6349da4bd7ed46770961 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -27,6 +27,8 @@
    up, all the errors returned are DOS errors, not NT status codes. */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_spoolss.h"
+#include "../librpc/gen_ndr/cli_spoolss.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 f7f51d1e9a9cd195669b4549663fa8fb482c6105..d35557e5bdcade5891098fc1e471532ba0701d35 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -24,6 +24,7 @@
 /* This is the implementation of the srvsvc pipe. */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_srvsvc.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index f393a9a464957c35df3bae9ffe97d10743690544..26dc09ea7c9ff60dae9101ed021cef097f1463a1 100644 (file)
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -23,6 +23,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_svcctl.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index 3de9f0e623ad0757fb9e8ed1f9f35ffbae069fae..cf3043629d503f12b7a8a7bbd09d87be4db8d599 100644 (file)
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -21,6 +21,7 @@
 /* Implementation of registry functions. */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_winreg.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index ab09e8632f50a7f699257ce345bd6e7f98338189..1831b79e50f24e605a8bb35ed6dc70d2c8aa2873 100644 (file)
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/srv_wkssvc.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index d55261bea31d2c8bf81f6b83b8b003baa6aeb3b9..1f1eb3da325e36b8114b5bb0db6c88d2c5c428ca 100644 (file)
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_dfs.h"
 
 /* Check DFS is supported by the remote server */
 

diff --git a/source3/rpcclient/cmd_drsuapi.c b/source3/rpcclient/cmd_drsuapi.c
index 8fbd798ed0de31c3ddee9ccaaba09c263e2abb79..b2939d4a23c4076f5874ede551ad635533d07838 100644 (file)
--- a/source3/rpcclient/cmd_drsuapi.c
+++ b/source3/rpcclient/cmd_drsuapi.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_drsuapi.h"
 
 static WERROR cracknames(struct rpc_pipe_client *cli,
                         TALLOC_CTX *mem_ctx,

diff --git a/source3/rpcclient/cmd_dssetup.c b/source3/rpcclient/cmd_dssetup.c
index f2fd1249676650f89a300f24dd9eee873a17f91a..88f541bb51d00c3464d4c13ef5ec696e2bcf0751 100644 (file)
--- a/source3/rpcclient/cmd_dssetup.c
+++ b/source3/rpcclient/cmd_dssetup.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_dssetup.h"
 
 /* Look up domain related information on a remote host */
 

diff --git a/source3/rpcclient/cmd_echo.c b/source3/rpcclient/cmd_echo.c
index d90ef3499f739893f0d8a38e95cbbb2d72cd0f55..cf5f9e00ef504e172782a6fd74e9a735a7160b14 100644 (file)
--- a/source3/rpcclient/cmd_echo.c
+++ b/source3/rpcclient/cmd_echo.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_echo.h"
 
 static NTSTATUS cmd_echo_add_one(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                                 int argc, const char **argv)

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

diff --git a/source3/rpcclient/cmd_eventlog.c b/source3/rpcclient/cmd_eventlog.c
index d839bf426329271344fe289aa6ce28f280cf7cef..3acaf0ca83aa6aa8bccf96e11b0983756dcc9b73 100644 (file)
--- a/source3/rpcclient/cmd_eventlog.c
+++ b/source3/rpcclient/cmd_eventlog.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_eventlog.h"
 
 static NTSTATUS get_eventlog_handle(struct rpc_pipe_client *cli,
                                    TALLOC_CTX *mem_ctx,

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 45868bf5a90de68813b6a9581da30f7537a9a6a2..e0f4ac4adc09fbcc52415aa4c17c8e91c14bd712 100644 (file)
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */

diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 2fbadf2a75be6a034f0c9a02c9c3bd1f74afc163..6317f8b389a1c47e615bb424dfbd94a16fadc965 100644 (file)
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx, int argc,

diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index a345cdc8bf0b3d84a83bd5a4ee47745a9fa80d90..95b905ab2ddf3330a8d5df0d0f38246a4b3e3703 100644 (file)
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_ntsvcs.h"
 
 static WERROR cmd_ntsvcs_get_version(struct rpc_pipe_client *cli,
                                     TALLOC_CTX *mem_ctx,

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index e52411f8f751e0bfd67555dc6e0d55e00b36a5fc..e21a57fba7a3137cf9693d7bbda265d25862fd29 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 extern DOM_SID domain_sid;
 

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 8b1a6eac03624a7cf9d64ec9716176b497b855c5..e24fb99e6fdc0a5b20b3bca2e6dddbaa70a2e6ed 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \

diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 10017fa19b4878b63c459e00c1b8a28053fc38e3..866b68111d81380a454debb4c3cf504b06ebfad4 100644 (file)
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 /* Display server query info */
 

diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c
index 85e90a19b514a2244ea6c86c864c345223e8888d..e12e703f3eae044b85ade00687d400ff358dd21e 100644 (file)
--- a/source3/rpcclient/cmd_test.c
+++ b/source3/rpcclient/cmd_test.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 static NTSTATUS cmd_testme(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                           int argc, const char **argv)

diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index 7a34c450ab7005a5057da89fbec945c8db8f8538..e8dc48d4a33566476af8f072cfaaf03e636f42f3 100644 (file)
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "rpcclient.h"
+#include "../librpc/gen_ndr/cli_wkssvc.h"
 
 static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
                                      TALLOC_CTX *mem_ctx,

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 5f59c26583abb6092af9832385586251660836d5..f6d56adecec4bbc63f7abc0173ec986eacebb437 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 DOM_SID domain_sid;
 

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 074f7e2c37028b6e8fffb34bcfe869ffe52f8c94..2bee5c1bde491b6fa4b4c86e6b32cf770c1bdf89 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -27,6 +27,8 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/srv_samr.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index fbaa9dee290491016be52e8f0d6d805da8e09355..3c5cb530264eab33afb0033773e1a579eb0fa40b 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -20,6 +20,21 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/srv_dfs.h"
+#include "../librpc/gen_ndr/srv_drsuapi.h"
+#include "../librpc/gen_ndr/srv_dssetup.h"
+#include "../librpc/gen_ndr/srv_echo.h"
+#include "../librpc/gen_ndr/srv_eventlog.h"
+#include "../librpc/gen_ndr/srv_initshutdown.h"
+#include "../librpc/gen_ndr/srv_lsa.h"
+#include "../librpc/gen_ndr/srv_netlogon.h"
+#include "../librpc/gen_ndr/srv_ntsvcs.h"
+#include "../librpc/gen_ndr/srv_samr.h"
+#include "../librpc/gen_ndr/srv_spoolss.h"
+#include "../librpc/gen_ndr/srv_srvsvc.h"
+#include "../librpc/gen_ndr/srv_svcctl.h"
+#include "../librpc/gen_ndr/srv_winreg.h"
+#include "../librpc/gen_ndr/srv_wkssvc.h"
 
 extern bool global_machine_password_needs_changing;
 

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 031a338835d6a4d065dba12a17a50219ef7cd578..f133eec0fc19b5150d9c19a7fe0ed1c1db54b2ef 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
 #ifdef HAVE_ADS

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

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 910d782fbad356149431c670eb8a66c3aed29b78..fdb11f33a039966068e74781dffea80d155a0f0a 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -23,6 +23,13 @@
 #include "includes.h"
 #include "utils/net.h"
 #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"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "../librpc/gen_ndr/cli_initshutdown.h"
+#include "../librpc/gen_ndr/cli_winreg.h"
 
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);

diff --git a/source3/utils/net_rpc_audit.c b/source3/utils/net_rpc_audit.c
index bc3ed3dba24add0e48495f8440906ab31b584f9e..b001c9c6236f61f32d99dd5ac5324cae59dc9c06 100644 (file)
--- a/source3/utils/net_rpc_audit.c
+++ b/source3/utils/net_rpc_audit.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 /********************************************************************
 ********************************************************************/

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

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 5652caf8341725c85c45c3f99d5b7a43d0e20adc..6ad8224c869c663820153c9aff32d9b72ea01eb3 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -18,6 +18,7 @@
 */
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 36e83a75af8e1bdf07f44d1caa1ca95208d1baa3..aa3a13208cb653b2eb92de97e8824aa4dfc9839f 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -22,6 +22,7 @@
 #include "utils/net_registry_util.h"
 #include "regfio.h"
 #include "reg_objects.h"
+#include "../librpc/gen_ndr/cli_winreg.h"
 
 /*******************************************************************
  connect to a registry hive root (open a registry policy)

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index defed479149f4e3416cab20cff9226ecd02eb877..fca73c0200a7acfe3aa1045af6b37ad702f9b78b 100644 (file)
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -19,6 +19,7 @@
 */
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 /********************************************************************
 ********************************************************************/

diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 1ef7c3ed098526237b6417b2d73ccc9e0e22e3e3..4edf94e8d9f4476547a2ee2ba1b0be5948885f66 100644 (file)
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -18,7 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
-
+#include "../librpc/gen_ndr/cli_svcctl.h"
 
 struct svc_state_msg {
        uint32 flag;

diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 83ce3551d1c3ef4d2dc4ff8c0c1e174f5a5fec26..efd90abb3093d83a79ce980769e345b9cb74ca90 100644 (file)
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -18,6 +18,7 @@
 */
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 /*
  * Do something with the account policies. Read them all, run a function on

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index eaa2125e34f7a58242828d9861d1b9d6dfa70936..6bb5a3836cb2aeccf078c04146ec0b837546d7dc 100644 (file)
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -21,6 +21,8 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/cli_dssetup.h"
 
 NTSTATUS net_rpc_lookup_name(struct net_context *c,
                             TALLOC_CTX *mem_ctx, struct cli_state *cli,

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 717ce650068d0e1737e302432a35da8d6df1afb3..d7ba1234ede21d10440bea6a0c09dc4c47dc80e7 100644 (file)
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/cli_srvsvc.h"
 
 static int use_bcast;
 

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index b2716716656ecd760c544d13b859a18290b408b3..92c027208832227950b8434cae12c66c76c2f365 100644 (file)
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 #ifdef HAVE_ADS
 

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index e310d426a28ee01a53e897a4715e0dcf73bfd3b1..36b769bf1b327ed263304cf5472b7f0c862aa71d 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -61,6 +61,10 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/cli_dssetup.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 49463d6f8fc0c95689f3a38f4652dcc65da5a5f8..cecbb61051509960ff6b0990132515a6b28eb9f4 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -24,6 +24,7 @@
 #include "winbindd/winbindd.h"
 #include "winbindd/winbindd_proto.h"
 #include "librpc/gen_ndr/srv_wbint.h"
+#include "../librpc/gen_ndr/cli_netlogon.h"
 
 void _wbint_Ping(pipes_struct *p, struct wbint_Ping *r)
 {

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 1917718462e69949042397d1faca599775ae0b2a..3ebd9ffdbd25f37bb1676ee40a9a1b4971dffe15 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "../librpc/gen_ndr/cli_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 755f703d634d1ab2d84637b68aa82176653b07fa..3117533f316c0bacdbd32ca96e447cdcbd71dec5 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -25,6 +25,8 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index ce437f744cafb7aa882d35ab1a426ab5251623ad..b92637072277b0fe7dafa1bb8ef7a70c23511b31 100644 (file)
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -24,6 +24,8 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND