From 1060f6b3f621cb70b075a879f129e57f10fdbf8a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 14 Mar 2006 23:35:30 +0000 Subject: [PATCH] r14402: Generate seperate headers for RPC client functions. (This used to be commit 7054ebf0249930843a2baf4d023ae8f62cedb109) --- source4/client/client.c | 1 + source4/gtk/common/select.c | 2 +- source4/gtk/tools/gepdump.c | 2 ++ source4/gtk/tools/gwcrontab.c | 1 + source4/gtk/tools/gwsam.c | 1 + source4/lib/com/dcom/main.c | 1 + source4/lib/registry/reg_backend_rpc.c | 1 + source4/libcli/util/clilsa.c | 1 + source4/libnet/domain.c | 1 + source4/libnet/libnet_join.c | 2 ++ source4/libnet/libnet_passwd.c | 1 + source4/libnet/libnet_rpc.c | 1 + source4/libnet/libnet_share.c | 1 + source4/libnet/libnet_time.c | 1 + source4/libnet/libnet_vampire.c | 1 + source4/libnet/userinfo.c | 1 + source4/libnet/userman.c | 1 + source4/librpc/ndr/libndr.h | 5 ++++ source4/librpc/rpc/dcerpc_schannel.c | 1 + source4/librpc/rpc/dcerpc_util.c | 1 + .../pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 25 +++++++++++-------- .../pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 5 ++-- source4/pidl/pidl | 10 ++++++-- source4/torture/libnet/domain.c | 1 + source4/torture/libnet/libnet_share.c | 1 + source4/torture/libnet/libnet_user.c | 1 + source4/torture/libnet/userinfo.c | 1 + source4/torture/libnet/userman.c | 1 + source4/torture/rpc/atsvc.c | 1 + source4/torture/rpc/autoidl.c | 1 + source4/torture/rpc/bench.c | 1 + source4/torture/rpc/dfs.c | 1 + source4/torture/rpc/drsuapi.c | 1 + source4/torture/rpc/drsuapi_cracknames.c | 1 + source4/torture/rpc/dssetup.c | 1 + source4/torture/rpc/dssync.c | 1 + source4/torture/rpc/echo.c | 1 + source4/torture/rpc/epmapper.c | 1 + source4/torture/rpc/eventlog.c | 1 + source4/torture/rpc/initshutdown.c | 1 + source4/torture/rpc/lsa.c | 1 + source4/torture/rpc/lsa_lookup.c | 1 + source4/torture/rpc/mgmt.c | 1 + source4/torture/rpc/netlogon.c | 2 ++ source4/torture/rpc/oxidresolve.c | 2 ++ source4/torture/rpc/remact.c | 2 ++ source4/torture/rpc/samlogon.c | 1 + source4/torture/rpc/samr.c | 1 + source4/torture/rpc/samsync.c | 3 +++ source4/torture/rpc/scanner.c | 1 + source4/torture/rpc/schannel.c | 3 +++ source4/torture/rpc/session_key.c | 1 + source4/torture/rpc/spoolss.c | 1 + source4/torture/rpc/srvsvc.c | 1 + source4/torture/rpc/svcctl.c | 1 + source4/torture/rpc/testjoin.c | 1 + source4/torture/rpc/unixinfo.c | 1 + source4/torture/rpc/winreg.c | 1 + source4/torture/rpc/wkssvc.c | 1 + source4/winbind/wb_async_helpers.c | 3 +++ source4/winbind/wb_cmd_getdcname.c | 1 + source4/winbind/wb_cmd_list_trustdom.c | 1 + source4/winbind/wb_cmd_usersids.c | 1 + source4/winbind/wb_connect_lsa.c | 1 + source4/winbind/wb_connect_sam.c | 1 + source4/winbind/wb_dom_info_trusted.c | 1 + source4/winbind/wb_init_domain.c | 1 + source4/winbind/wb_pam_auth.c | 1 + 68 files changed, 104 insertions(+), 17 deletions(-) diff --git a/source4/client/client.c b/source4/client/client.c index 7f043f9a5db..b9864f96713 100644 --- 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 61b9649657c..c3e73b5c130 100644 --- 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 eab3987a9a6..5d62969028b 100644 --- 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 f2e42d01ddd..cd2bc30d6e7 100644 --- 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 633b04851aa..608dc1be8dd 100644 --- 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 d69a8f6a321..c05e1fdceb6 100644 --- 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 b29895b27df..5b2f8733313 100644 --- 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 97aa7e13acc..7cafef829a9 100644 --- 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 342b92f4038..e48454f0e18 100644 --- 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 914c2bfbb1e..3b0d861e010 100644 --- 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 30012282e09..e5059c5f08c 100644 --- 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 5b63f482df1..3e9f069fb57 100644 --- 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 2fbf2c2f442..35980fdcbba 100644 --- 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 c7f8c79db55..d1d8298e3c4 100644 --- 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 93e752311f3..352dde27e6a 100644 --- 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 8f473b862bd..5fcdd614e2e 100644 --- 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 36fcf75783e..94358f1c0c2 100644 --- 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 e5234ac7eda..d6f46fa44e9 100644 --- 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 229f359d203..0d589bad6be 100644 --- 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 8813270b1af..6a3e02a5558 100644 --- 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 1da765303cb..60faa78df38 100644 --- 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 4a1f8a9c141..249a1ae194f 100644 --- 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 1c70b35e02b..1cfc005c2f4 100755 --- 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 439561e3d06..18933cb033f 100644 --- 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 25a86a7072f..b7d877b0975 100644 --- 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 207645c6d5b..adb9a3bdd71 100644 --- 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 cf5dc2e410a..44a0dcf79b6 100644 --- 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 f4d988e1b97..2df495a15fc 100644 --- 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 bfc44a4bb19..cb948f8a5d5 100644 --- 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 cc9d8a1641d..af92b1a89c8 100644 --- 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 c4a08597259..a5aaaeeb299 100644 --- 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 14261c41235..d8f6b1a27e6 100644 --- 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 0b700a7ac47..75efff89b3b 100644 --- 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 ef8a5cc45d3..c3002761b4c 100644 --- 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 70f8c99dde3..cc285b3eefd 100644 --- 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 d334f162bcb..ac28e0e2221 100644 --- 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 49752665e4e..6c5af71fc75 100644 --- 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 4f6cb122a86..69537c8f5ce 100644 --- 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 8de099d2152..1372dd6b733 100644 --- 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 efd320052dc..d0b6e612e37 100644 --- 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 980c9b36e69..b8669e1b70c 100644 --- 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 c009f89f58e..146131286df 100644 --- 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 d94c65e1d93..b88ee2243c0 100644 --- 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 a64df0f5bb1..14e7a49305a 100644 --- 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 e3070fa6ee9..950d9184dcf 100644 --- 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 69c31fc6427..13d41394b8a 100644 --- 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 ecca8418b8f..cca1cdeb989 100644 --- 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 e518a0782ee..10541ccf541 100644 --- 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 75a90b8b55d..4ed28ab5638 100644 --- 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 d714fe54278..d2a3a6894a4 100644 --- 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 f48e4c2a08a..efcb2792867 100644 --- 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 9656eda054c..34cd06724d5 100644 --- 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 9cc438d9b88..49db6e3967d 100644 --- 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 e5e92217601..c9aa22c4bc9 100644 --- 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 dddfea961bc..d55c879bd77 100644 --- 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 4df25d2aea0..55fa25fb387 100644 --- 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 946d5e18030..ba1c06d346f 100644 --- 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 88d50f73d7c..e8e2f0e3465 100644 --- 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 01e81a8de72..7a3b487423b 100644 --- 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 c8611e6300a..ad1aaae0d27 100644 --- 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 2952ffc976a..58ad2b2d953 100644 --- 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 cfe71faf746..6b153b05506 100644 --- 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 4e2195d8836..1d5b131a14a 100644 --- 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 1c9cb5f39a3..7ea41f66082 100644 --- 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 2c26ffe29ab..e1f4d6a317c 100644 --- 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 652d646d864..e3c7984e64b 100644 --- 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 4c286cc6e61..195a20fd1f4 100644 --- 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 2967414fec3..558dfcae492 100644 --- 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 { -- 2.34.1