r14402: Generate seperate headers for RPC client functions.

(This used to be commit 7054ebf0249930843a2baf4d023ae8f62cedb109)

diff --git a/source4/client/client.c b/source4/client/client.c
index 7f043f9a5db9ad3e6d2e81f4f1a65cdb17b2f86f..b9864f967132d8cd3a928016bd6cc2dfec5ff4d6 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -26,6 +26,7 @@
 #include "libcli/libcli.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/util/clilsa.h"

diff --git a/source4/gtk/common/select.c b/source4/gtk/common/select.c
index 61b9649657cb6c40c7a084de5435a3475b67ad31..c3e73b5c130eb00cb8856f7f8bba1346399ea54f 100644 (file)
--- a/source4/gtk/common/select.c
+++ b/source4/gtk/common/select.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 

diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index eab3987a9a6c9b1be6c6731278ac237d8a1c2234..5d62969028b815844d6426a7b8943ad4acf4dfa0 100644 (file)
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -21,7 +21,9 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "librpc/gen_ndr/ndr_mgmt.h"
+#include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "gtk/common/gtk-smb.h"
 #include "auth/gensec/gensec.h"
 

diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index f2e42d01ddd2c47351488c14eb5ee32f8243cc70..cd2bc30d6e7f1a826ee45088eb68219bba185f4f 100644 (file)
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_atsvc.h"
+#include "librpc/gen_ndr/ndr_atsvc_c.h"
 #include "gtk/common/gtk-smb.h"
 #include "auth/credentials/credentials.h"
 

diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 633b04851aa39a0d42420021592f2f5106305d7c..608dc1be8dd6aadabbc8eda714045784ef7f1da9 100644 (file)
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 #include "auth/credentials/credentials.h"

diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index d69a8f6a32148472071852ad45738e825723a5b6..c05e1fdceb6b2a08cacb847900c01eb6cdc8e3b6 100644 (file)
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -22,6 +22,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_remact.h"
+#include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/com/dcom/dcom.h"
 #include "librpc/rpc/dcerpc_table.h"

diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c
index b29895b27df7cb7c67f21bf3f4c91c9481d0730e..5b2f87333135c180372c6f23cce7c5c7ca3a0eb6 100644 (file)
--- a/source4/lib/registry/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
+#include "librpc/gen_ndr/ndr_winreg_c.h"
 
 static struct hive_operations reg_backend_rpc;
 

diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 97aa7e13accd4ec20b83fd89ec23eb11a8923e0a..7cafef829a9629ad4d578ffdedc2e51722e9ca15 100644 (file)
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -31,6 +31,7 @@
 #include "libcli/libcli.h"
 #include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 struct smblsa_state {
        struct dcerpc_pipe *pipe;

diff --git a/source4/libnet/domain.c b/source4/libnet/domain.c
index 342b92f40387936ef8d337676443d9367dcf4eaf..e48454f0e180d0ea285570cb233e78c827426b77 100644 (file)
--- a/source4/libnet/domain.c
+++ b/source4/libnet/domain.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "libnet/composite.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 static void domain_open_handler(struct rpc_request*);
 

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 914c2bfbb1e284bffb467449efdc3c939a3914ab..3b0d861e010ed4072d274e366ad4b006ebeab1e8 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "passdb/secrets.h"
@@ -30,6 +31,7 @@
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 /*
  * complete a domain join, when joining to a AD domain:

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 30012282e090aec66a18be82ec691681a7bd40d5..e5059c5f08caeaf7187048285c1b8347d1345d02 100644 (file)
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 /*
  * do a password change using DCERPC/SAMR calls

diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 5b63f482df1d29ba1a42c7db4ec0580e873d79e7..3e9f069fb575af318869defc0c6b2221bea3501d 100644 (file)
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/libcli.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 /**
  * Connects rpc pipe on remote server

diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c
index 2fbf2c2f4428004aa20d62acc38276a4aedd6753..35980fdcbba26f7b19aebc8492ef14fa92f7c497 100644 (file)
--- a/source4/libnet/libnet_share.c
+++ b/source4/libnet/libnet_share.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 
 NTSTATUS libnet_ListShares(struct libnet_context *ctx, 

diff --git a/source4/libnet/libnet_time.c b/source4/libnet/libnet_time.c
index c7f8c79db55c4b9df677e2f6b7239390ecf545a6..d1d8298e3c484d4a2dee7790749dfecf1e195b71 100644 (file)
--- a/source4/libnet/libnet_time.c
+++ b/source4/libnet/libnet_time.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "system/time.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 /*
  * get the remote time of a server via srvsvc_NetRemoteTOD

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 93e752311f3d2ccc199b1185b0df524a22232ad9..352dde27e6a02dc1006553e9e1fb8c7a226fe8af 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -25,6 +25,7 @@
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/schannel_proto.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 
 /**

diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 8f473b862bd98b002bb6d6e0b25eccf4591fdb2a..5fcdd614e2e66c39c78e991c67cca00c9e54707a 100644 (file)
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -27,6 +27,7 @@
 #include "libcli/security/proto.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 static void userinfo_handler(struct rpc_request *req);
 

diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index 36fcf75783efd91f8a42ea38a1be941baf5d2c79..94358f1c0c23e29e38018d2be5f824c6b7a14110 100644 (file)
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -27,6 +27,7 @@
 #include "libnet/composite.h"
 #include "libnet/userman.h"
 #include "libnet/userinfo.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 /*
  * Composite USER ADD functionality

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index e5234ac7eda7d4238f4751e6b632c46c7f53db31..d6f46fa44e9d873e14ad8ca04b6863233e9d55d8 100644 (file)
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -18,6 +18,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBNDR_H__
+#define __LIBNDR_H__
+
 /*
   this provides definitions for the libcli/rpc/ MSRPC library
 */
@@ -282,3 +285,5 @@ extern const struct dcerpc_syntax_id ndr64_transfer_syntax;
 
 #include "librpc/gen_ndr/misc.h"
 #include "librpc/ndr/libndr_proto.h"
+
+#endif /* __LIBNDR_H__ */

diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 229f359d203e29b90621e530434e368dc0b86705..0d589bad6bec8975578ca851e9b69fadb0d0fb6d 100644 (file)
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "libcli/composite/composite.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 
 struct schannel_key_state {

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 8813270b1afd398cbbcad3eed8c2c818b6ea77d0..6a3e02a555855cede9d0186dfe2c7ed410429c2c 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -27,6 +27,7 @@
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "auth/credentials/credentials.h"

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 1da765303cbbd38d9d96e4a30ad763f60b8f4269..60faa78df387716bb9541a722237e0570c38856b 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -10,7 +10,7 @@ $VERSION = '0.01';
 
 use strict;
 
-my($res);
+my($res,$res_hdr);
 
 #####################################################################
 # parse a function
@@ -20,6 +20,10 @@ sub ParseFunction($$)
        my $name = $fn->{NAME};
        my $uname = uc $name;
 
+       $res_hdr .= "\nstruct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
+NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
+";
+
        $res .= "
 struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r)
 {
@@ -74,29 +78,28 @@ sub ParseInterface($)
        return $res;
 }
 
-sub Parse($$)
+sub Parse($$$$)
 {
-       my($ndr) = shift;
-       my($filename) = shift;
+       my($ndr,$header,$ndr_header,$client_header) = @_;
 
-       my $h_filename = $filename;
        $res = "";
-
-       if ($h_filename =~ /(.*)\.c/) {
-               $h_filename = "$1.h";
-       }
+       $res_hdr = "";
 
        $res .= "/* client functions auto-generated by pidl */\n";
        $res .= "\n";
        $res .= "#include \"includes.h\"\n";
-       $res .= "#include \"$h_filename\"\n";
+       $res .= "#include \"$ndr_header\"\n";
+       $res .= "#include \"$client_header\"\n";
        $res .= "\n";
 
+       $res_hdr .= "#include \"librpc/rpc/dcerpc.h\"\n";
+       $res_hdr .= "#include \"$header\"\n";
+
        foreach my $x (@{$ndr}) {
                ($x->{TYPE} eq "INTERFACE") && ParseInterface($x);
        }
 
-       return $res;
+       return ($res,$res_hdr);
 }
 
 1;

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 4a1f8a9c1412a41bfcc271135530914214e6b97d..249a1ae194f0ed19212f88c3d3d588c560a88a3f 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2237,6 +2237,8 @@ sub HeaderInterface($)
 
        my $count = 0;
 
+       pidl_hdr "#include \"librpc/ndr/libndr.h\"";
+
        if (defined $interface->{PROPERTIES}->{depends}) {
                my @d = split / /, $interface->{PROPERTIES}->{depends};
                foreach my $i (@d) {
@@ -2279,9 +2281,6 @@ sub HeaderInterface($)
                
                pidl_hdr "#define DCERPC_$u_name ($val)";
 
-               pidl_hdr "NTSTATUS dcerpc_$_->{NAME}(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $_->{NAME} *r);";
-               pidl_hdr "struct rpc_request *dcerpc_$_->{NAME}\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $_->{NAME} *r);";
-
                pidl_hdr "";
                $count++;
        }

diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index 1c70b35e02b8728d840a9fbe30a79978f5fb0996..1cfc005c2f4a3ade6beed3472b57c338fc601793 100755 (executable)
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -668,9 +668,15 @@ sub process_file($)
        my $h_filename = "$outputdir/ndr_$basename.h";
        if (defined($opt_client)) {
                require Parse::Pidl::Samba4::NDR::Client;
-               my ($client) = ($opt_client or "$outputdir/ndr_$basename\_c.c");
+               my ($c_client) = ($opt_client or "$outputdir/ndr_$basename\_c.c");
+               my ($c_header) = $c_client;
+               $c_header =~ s/\.c$/.h/;
 
-               FileSave($client, Parse::Pidl::Samba4::NDR::Client::Parse($ndr,$h_filename));
+               my ($srcd,$hdrd) = Parse::Pidl::Samba4::NDR::Client::Parse(
+                       $ndr,$gen_header,$h_filename,$c_header);
+
+               FileSave($c_client, $srcd);
+               FileSave($c_header, $hdrd);
        }
 
        if (defined($opt_ejs)) {

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 439561e3d06a29ded8d31c7d8d9e40c01cb477a0..18933cb033f9c6123c601052f94ba91cf61c29e0 100644 (file)
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                            struct lsa_String *domname,

diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 25a86a7072f3ae963431d8434c1415f8468c5416..b7d877b0975ca507c866f70eddaa57904a9490d7 100644 (file)
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -24,6 +24,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 
 
 #define TEST_SHARENAME "libnetsharetest"

diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 207645c6d5b6e9dd5a63f4b9a17f82166ddbdb94..adb9a3bdd71602cc782e508eafe0385bd858cadb 100644 (file)
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 
 #define TEST_USERNAME  "libnetusertest"

diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index cf5dc2e410a248daaecc74ed85a024c1bd54f298..44a0dcf79b6bd00ca4973c7038f5c9f4df5aba1a 100644 (file)
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "libnet/userinfo.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 

diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index f4d988e1b9796910b3192e15760134c7d387d614..2df495a15fc85442f633a35d3a73811913ed87a0 100644 (file)
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,6 +23,7 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/userman.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 #define TEST_USERNAME  "libnetusermantest"
 

diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index bfc44a4bb19929562d6b3830a18dcb53d1e90c5b..cb948f8a5d5cd461bbfa05d39622c15b0b2e3988 100644 (file)
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_atsvc.h"
+#include "librpc/gen_ndr/ndr_atsvc_c.h"
 #include "torture/rpc/rpc.h"
 
 static BOOL test_JobGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32_t job_id)

diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index cc9d8a1641d343f044380d2319f94ed73ecdb1aa..af92b1a89c8fa79cdcaa1a2c456ead11d51ce785 100644 (file)
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"

diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index c4a08597259dc77888bf7c9ad44e176362740c9e..a5aaaeeb29960a79bf496db6187abcf9adee865e 100644 (file)
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "torture/rpc/rpc.h"
 
 /**************************/

diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 14261c41235dfe6d703319e43d6c7d9488e8378e..d8f6b1a27e6c320a3f65f5b9a87d68cd914dc44b 100644 (file)
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_dfs.h"
+#include "librpc/gen_ndr/ndr_dfs_c.h"
 
 
 static BOOL test_GetManagerVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)

diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 0b700a7ac4772570ea497f07f1b6dd1fcc5919f7..75efff89b3ba8528e660ff48c3f8d9eef2a1f9e5 100644 (file)
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "torture/rpc/rpc.h"
 
 BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 

diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index ef8a5cc45d3e221899745520567390b736c1448e..c3002761b4c3e98dd4c2e4db34e90fc8a87e587f 100644 (file)
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "torture/rpc/rpc.h"
 #include "ldb/include/ldb.h"
 

diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c
index 70f8c99dde3ce5cd2d271767954b3e6cbac73524..cc285b3eefdc9622cf80d84677015b1d47ad0792 100644 (file)
--- a/source4/torture/rpc/dssetup.c
+++ b/source4/torture/rpc/dssetup.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "librpc/gen_ndr/ndr_dssetup_c.h"
 #include "torture/rpc/rpc.h"
 
 

diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index d334f162bcb31466b2b3265cd7db63f46810beec..ac28e0e2221cfc492f177cdf2a978a67cf5e3539 100644 (file)
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "libcli/cldap/cldap.h"
 #include "libcli/ldap/ldap_client.h"
 #include "torture/ldap/proto.h"

diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 49752665e4e4ba16346dc4fb4cca7627b12c9b62..6c5af71fc75c34bac681e6b2606dcbe20148a189 100644 (file)
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -26,6 +26,7 @@
 #include "torture/rpc/rpc.h"
 #include "lib/events/events.h"
 #include "librpc/gen_ndr/ndr_echo.h"
+#include "librpc/gen_ndr/ndr_echo_c.h"
 
 
 /*

diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 4f6cb122a86a3f25139c3236c26dd84e3fe1f19b..69537c8f5ce37149d85d1e7555c12fe72ef52809 100644 (file)
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 8de099d2152ef7e88927f783f155cc1a11d9b40f..1372dd6b7331643f550f963f9e11521dd732ca85 100644 (file)
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_eventlog.h"
+#include "librpc/gen_ndr/ndr_eventlog_c.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c
index efd320052dc92cfa6b0172e890f4a752fc06e0a2..d0b6e612e371da176e676611fd5741e3f7214f8f 100644 (file)
--- a/source4/torture/rpc/initshutdown.c
+++ b/source4/torture/rpc/initshutdown.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_initshutdown.h"
+#include "librpc/gen_ndr/ndr_initshutdown_c.h"
 #include "torture/rpc/rpc.h"
 
 static void init_initshutdown_String(TALLOC_CTX *mem_ctx, struct initshutdown_String *name, const char *s)

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 980c9b36e690666fade62dd6c11515bc382ad20b..b8669e1b70c34a1730b26beb9f5d38f05c0f50b1 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "lib/events/events.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/libcli_auth.h"

diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index c009f89f58eaa8642b01a21567a42e64db9b785a..146131286df7ea52fc326046321c6beef96af992 100644 (file)
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -26,6 +26,7 @@
 #include "libcli/security/proto.h"
 #include "libnet/libnet_join.h"
 #include "torture/rpc/rpc.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
                        struct policy_handle **handle)

diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index d94c65e1d93e286d9ca753d543b14a31eecfaaa6..b88ee2243c0de410b1161b732f29d4481979ac27 100644 (file)
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_mgmt.h"
+#include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "auth/gensec/gensec.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index a64df0f5bb17ac7b070c71a5faf9194a30229702..14e7a49305a01e58f6f5a927a8787558ec45a788 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -30,6 +30,8 @@
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 static const char *machine_password;
 

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index e3070fa6ee9c07da0dd463e02e1b31f8fa787dbb..950d9184dcf4166c4e99321d379490d356ad1b3a 100644 (file)
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -22,7 +22,9 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_oxidresolver.h"
+#include "librpc/gen_ndr/ndr_oxidresolver_c.h"
 #include "librpc/gen_ndr/ndr_remact.h"
+#include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 69c31fc6427a269ab86491f5adeb912a855cf9f7..13d41394b8a818d508b93ad6b11766406b92abe5 100644 (file)
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -22,7 +22,9 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_remact.h"
+#include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
+#include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "torture/rpc/rpc.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index ecca8418b8ff307937f071d6c46dfdcf5ffb2a9c..cca1cdeb98978ca1ef77e78f255e3ffcf125cdc4 100644 (file)
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index e518a0782ee524bf2677f1aa32f06276fb3b0741..10541ccf541f9101c22310a1d1a77805c076403e 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 75a90b8b55dfc575894bc4ef443c9ef79a16766e..4ed28ab56381d4ca00ed38b0d369a1abb5af4415 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -32,6 +32,9 @@
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/proto.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"

diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index d714fe54278be1d1ba75707b48e4e70eb84a34ff..d2a3a6894a4e96645be80817c0287353b2d743a2 100644 (file)
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_mgmt.h"
+#include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index f48e4c2a08ab23be6872709832641261469835ed..efcb27928676543c5a31d61b293b394b905f6e42 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -22,6 +22,9 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/rpc.h"
 #include "lib/cmdline/popt_common.h"

diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 9656eda054c30ec29cef77c750262ee27c8b5019..34cd06724d52a13139d065206306b9d3f12a0c72 100644 (file)
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 9cc438d9b88fa0103b427d72ef2cc9afa37b9ebf..49db6e3967d827651b4e6f39fe2d040d6d29f639 100644 (file)
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_spoolss.h"
+#include "librpc/gen_ndr/ndr_spoolss_c.h"
 
 struct test_spoolss_context {
        struct dcerpc_pipe *p;

diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index e5e92217601f0cb723fb0479aeb545c4e80c93f5..c9aa22c4bc960de8660308825a06840225b1e6f6 100644 (file)
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "torture/rpc/rpc.h"
 
 /**************************/

diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index dddfea961bc36b46bfb29c47920130180b66185f..d55c879bd77c4ca01a28fd8870c9d472c939f433 100644 (file)
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
+#include "librpc/gen_ndr/ndr_svcctl_c.h"
 #include "torture/rpc/rpc.h"
 
 static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *h)

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 4df25d2aea0cfc5037bdaf5aa87a1e9040bc1b74..55fa25fb38763df2ffd29d78ea103a618429bc11 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -33,6 +33,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "smb.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"

diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c
index 946d5e18030cf31494a089de65a026d9196e8809..ba1c06d346f3edaf6b602d4339c4b12cdd5cbc2f 100644 (file)
--- a/source4/torture/rpc/unixinfo.c
+++ b/source4/torture/rpc/unixinfo.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_unixinfo.h"
+#include "librpc/gen_ndr/ndr_unixinfo_c.h"
 
 
 /*

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 88d50f73d7cef7af3df89de1d0788f3e8b9b684f..e8e2f0e3465f754c3e1e9afe68a770634d352660 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
+#include "librpc/gen_ndr/ndr_winreg_c.h"
 #include "libcli/security/proto.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 01e81a8de72b9b4e03734c3dc516910c15a8749f..7a3b487423bbb88e713961a02c0708ee719db3e0 100644 (file)
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_wkssvc.h"
+#include "librpc/gen_ndr/ndr_wkssvc_c.h"
 #include "torture/rpc/rpc.h"
 
 

diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index c8611e6300a9897de6cf2a7a6bf5c7e4b4d516c1..ad1aaae0d27901fbb0a297a61233e294afb65abb 100644 (file)
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -30,6 +30,9 @@
 #include "libcli/auth/credentials.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 #include "winbind/wb_helper.h"
 

diff --git a/source4/winbind/wb_cmd_getdcname.c b/source4/winbind/wb_cmd_getdcname.c
index 2952ffc976a0f1b4cc6e891d2a1a954fbd651275..58ad2b2d9530e1dde95e584139330a58ed0cd89a 100644 (file)
--- a/source4/winbind/wb_cmd_getdcname.c
+++ b/source4/winbind/wb_cmd_getdcname.c
@@ -26,6 +26,7 @@
 #include "smbd/service_task.h"
 
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 struct cmd_getdcname_state {
        struct composite_context *ctx;

diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c
index cfe71faf74699d89bbc321939dfd3cc0357d7fd8..6b153b05506cbea53c5f0de76c21273a79e25da8 100644 (file)
--- a/source4/winbind/wb_cmd_list_trustdom.c
+++ b/source4/winbind/wb_cmd_list_trustdom.c
@@ -25,6 +25,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 /* List trusted domains. To avoid the trouble with having to wait for other
  * conflicting requests waiting for the lsa pipe we're opening our own lsa

diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c
index 4e2195d88367dc18be15d6733093da39f45ab472..1d5b131a14af76a6cbaa1598df0c75b556d4bdcb 100644 (file)
--- a/source4/winbind/wb_cmd_usersids.c
+++ b/source4/winbind/wb_cmd_usersids.c
@@ -25,6 +25,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 #include "libcli/security/proto.h"
 
 /* Calculate the token in two steps: Go the user's originating domain, ask for

diff --git a/source4/winbind/wb_connect_lsa.c b/source4/winbind/wb_connect_lsa.c
index 1c9cb5f39a3427fc8f7a10397284a11b3a45c323..7ea41f66082cd1e7d54402910e5cd73bf17adfa5 100644 (file)
--- a/source4/winbind/wb_connect_lsa.c
+++ b/source4/winbind/wb_connect_lsa.c
@@ -26,6 +26,7 @@
 
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 /* Helper to initialize LSA with a specific auth methods. Verify by opening
  * the LSA policy. */

diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c
index 2c26ffe29abc00f7ef4adbea3c0d739ca41786a4..e1f4d6a317c0b4bf38f4409c415e368059cce222 100644 (file)
--- a/source4/winbind/wb_connect_sam.c
+++ b/source4/winbind/wb_connect_sam.c
@@ -27,6 +27,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
 
 
 /* Helper to initialize SAMR with a specific auth methods. Verify by opening

diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c
index 652d646d864c80c588972accfbec05eefc75f4a4..e3c7984e64b02702514339811ba6b74938f5f5d5 100644 (file)
--- a/source4/winbind/wb_dom_info_trusted.c
+++ b/source4/winbind/wb_dom_info_trusted.c
@@ -27,6 +27,7 @@
 #include "winbind/wb_server.h"
 #include "smbd/service_task.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 struct trusted_dom_info_state {
        struct composite_context *ctx;

diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index 4c286cc6e619683003d9254bfe93adac78be16ab..195a20fd1f4a8adf56e1a2b19073b435c45ffead 100644 (file)
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -28,6 +28,7 @@
 #include "winbind/wb_async_helpers.h"
 #include "winbind/wb_helper.h"
 #include "smbd/service_task.h"
+#include "librpc/gen_ndr/ndr_lsa_c.h"
 
 #include "libcli/auth/credentials.h"
 #include "libcli/security/proto.h"

diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index 2967414fec3cb6ee5c7563c2e122c9584cae06f3..558dfcae492d525a64c63e63a781d6ef5166038a 100644 (file)
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -27,6 +27,7 @@
 #include "smbd/service_task.h"
 #include "libcli/auth/credentials.h"
 #include "libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_netlogon_c.h"
 
 /* Oh, there is so much to keep an eye on when authenticating a user.  Oh my! */
 struct pam_auth_crap_state {