From e1e2195a4ab60a74ca0a11f8eeb0ba1abfbb37a7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 13 Apr 2010 22:06:51 +0200 Subject: s4:torture/rpc: rename rpc.h => torture_rpc.h The reason for this is that some systems include from within system headers. HP-UX 11.00 does so somewhere deep inside of . For torture/winbind/struct_based.c resolves to torture/rpc/rpc.h and breaks the build. metze --- source4/torture/libnet/domain.c | 2 +- source4/torture/libnet/groupinfo.c | 2 +- source4/torture/libnet/groupman.c | 2 +- source4/torture/libnet/libnet_BecomeDC.c | 2 +- source4/torture/libnet/libnet_domain.c | 2 +- source4/torture/libnet/libnet_group.c | 2 +- source4/torture/libnet/libnet_lookup.c | 2 +- source4/torture/libnet/libnet_rpc.c | 2 +- source4/torture/libnet/libnet_share.c | 2 +- source4/torture/libnet/libnet_user.c | 2 +- source4/torture/libnet/userinfo.c | 2 +- source4/torture/libnet/userman.c | 2 +- source4/torture/libnet/utils.c | 2 +- source4/torture/nbt/dgram.c | 2 +- source4/torture/ntp/ntp_signd.c | 2 +- source4/torture/rap/rpc.c | 2 +- source4/torture/raw/qfileinfo.c | 2 +- source4/torture/rpc/alter_context.c | 2 +- source4/torture/rpc/async_bind.c | 2 +- source4/torture/rpc/atsvc.c | 2 +- source4/torture/rpc/autoidl.c | 2 +- source4/torture/rpc/bench.c | 2 +- source4/torture/rpc/bind.c | 2 +- source4/torture/rpc/browser.c | 2 +- source4/torture/rpc/countcalls.c | 2 +- source4/torture/rpc/dfs.c | 2 +- source4/torture/rpc/drsuapi.c | 2 +- source4/torture/rpc/drsuapi_cracknames.c | 2 +- source4/torture/rpc/dsgetinfo.c | 2 +- source4/torture/rpc/dssetup.c | 2 +- source4/torture/rpc/dssync.c | 2 +- source4/torture/rpc/echo.c | 2 +- source4/torture/rpc/epmapper.c | 2 +- source4/torture/rpc/eventlog.c | 2 +- source4/torture/rpc/frsapi.c | 2 +- source4/torture/rpc/handles.c | 2 +- source4/torture/rpc/initshutdown.c | 2 +- source4/torture/rpc/join.c | 2 +- source4/torture/rpc/lsa.c | 2 +- source4/torture/rpc/lsa_lookup.c | 2 +- source4/torture/rpc/mgmt.c | 2 +- source4/torture/rpc/netlogon.c | 2 +- source4/torture/rpc/ntsvcs.c | 2 +- source4/torture/rpc/object_uuid.c | 2 +- source4/torture/rpc/oxidresolve.c | 2 +- source4/torture/rpc/remact.c | 2 +- source4/torture/rpc/remote_pac.c | 2 +- source4/torture/rpc/rpc.c | 2 +- source4/torture/rpc/rpc.h | 94 -------------------------------- source4/torture/rpc/samba3rpc.c | 2 +- source4/torture/rpc/samlogon.c | 2 +- source4/torture/rpc/samr.c | 2 +- source4/torture/rpc/samr_accessmask.c | 2 +- source4/torture/rpc/samsync.c | 2 +- source4/torture/rpc/scanner.c | 2 +- source4/torture/rpc/schannel.c | 2 +- source4/torture/rpc/session_key.c | 2 +- source4/torture/rpc/spoolss.c | 2 +- source4/torture/rpc/spoolss_notify.c | 2 +- source4/torture/rpc/spoolss_win.c | 2 +- source4/torture/rpc/srvsvc.c | 2 +- source4/torture/rpc/svcctl.c | 2 +- source4/torture/rpc/testjoin.c | 2 +- source4/torture/rpc/torture_rpc.h | 94 ++++++++++++++++++++++++++++++++ source4/torture/rpc/unixinfo.c | 2 +- source4/torture/rpc/winreg.c | 2 +- source4/torture/rpc/wkssvc.c | 2 +- 67 files changed, 159 insertions(+), 159 deletions(-) delete mode 100644 source4/torture/rpc/rpc.h create mode 100644 source4/torture/rpc/torture_rpc.h diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c index 110a2e8f99..11a006e42d 100644 --- a/source4/torture/libnet/domain.c +++ b/source4/torture/libnet/domain.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "param/param.h" diff --git a/source4/torture/libnet/groupinfo.c b/source4/torture/libnet/groupinfo.c index 6b58ddf0f5..affd1e5f96 100644 --- a/source4/torture/libnet/groupinfo.c +++ b/source4/torture/libnet/groupinfo.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libnet/libnet.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_samr_c.h" diff --git a/source4/torture/libnet/groupman.c b/source4/torture/libnet/groupman.c index e2b565735a..7788ee85c3 100644 --- a/source4/torture/libnet/groupman.c +++ b/source4/torture/libnet/groupman.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "torture/libnet/grouptest.h" #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index 562be4fc39..dd9e173b54 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libnet/libnet.h" #include "dsdb/samdb/samdb.h" #include "../lib/util/dlinklist.h" diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c index a8e0842bd2..5b747b06da 100644 --- a/source4/torture/libnet/libnet_domain.c +++ b/source4/torture/libnet/libnet_domain.c @@ -24,7 +24,7 @@ #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "librpc/gen_ndr/ndr_lsa_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" diff --git a/source4/torture/libnet/libnet_group.c b/source4/torture/libnet/libnet_group.c index d1148f0d23..10d1f1cf50 100644 --- a/source4/torture/libnet/libnet_group.c +++ b/source4/torture/libnet/libnet_group.c @@ -24,7 +24,7 @@ #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "librpc/gen_ndr/ndr_lsa_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c index 832a7e5f84..128442a070 100644 --- a/source4/torture/libnet/libnet_lookup.c +++ b/source4/torture/libnet/libnet_lookup.c @@ -22,7 +22,7 @@ #include "lib/cmdline/popt_common.h" #include "libnet/libnet.h" #include "libcli/libcli.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c index d4a87a8f26..5403394740 100644 --- a/source4/torture/libnet/libnet_rpc.c +++ b/source4/torture/libnet/libnet_rpc.c @@ -25,7 +25,7 @@ #include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_samr.h" #include "librpc/gen_ndr/ndr_srvsvc.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c index 3c0bc5320c..95b6bceff6 100644 --- a/source4/torture/libnet/libnet_share.c +++ b/source4/torture/libnet/libnet_share.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libnet/libnet.h" #include "lib/cmdline/popt_common.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c index 89367b90a3..140282bd2b 100644 --- a/source4/torture/libnet/libnet_user.c +++ b/source4/torture/libnet/libnet_user.c @@ -24,7 +24,7 @@ #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "librpc/gen_ndr/ndr_lsa_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "torture/libnet/usertest.h" #include "param/param.h" diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c index 7db04e4d38..aa5b8e8ccf 100644 --- a/source4/torture/libnet/userinfo.c +++ b/source4/torture/libnet/userinfo.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libnet/libnet.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_samr_c.h" diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c index b16a09cbe8..c1d67fb8b6 100644 --- a/source4/torture/libnet/userman.c +++ b/source4/torture/libnet/userman.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "torture/libnet/usertest.h" #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c index 606d218bba..564c601455 100644 --- a/source4/torture/libnet/utils.c +++ b/source4/torture/libnet/utils.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libnet/libnet.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "torture/libnet/utils.h" diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c index ed1bd57bd1..09aaa41c68 100644 --- a/source4/torture/nbt/dgram.c +++ b/source4/torture/nbt/dgram.c @@ -23,7 +23,7 @@ #include "libcli/dgram/libdgram.h" #include "lib/socket/socket.h" #include "lib/events/events.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libcli/resolve/resolve.h" #include "system/network.h" #include "lib/socket/netif.h" diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c index 49b95e2d4f..bf631f4445 100644 --- a/source4/torture/ntp/ntp_signd.c +++ b/source4/torture/ntp/ntp_signd.c @@ -25,7 +25,7 @@ #include "lib/stream/packet.h" #include "lib/tsocket/tsocket.h" #include "libcli/util/tstream.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "../lib/crypto/crypto.h" #include "libcli/auth/libcli_auth.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c index 68a106278d..5ac468c212 100644 --- a/source4/torture/rap/rpc.c +++ b/source4/torture/rap/rpc.c @@ -24,7 +24,7 @@ #include "libcli/rap/rap.h" #include "torture/rap/proto.h" #include "param/param.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" static bool test_rpc_netservergetinfo(struct torture_context *tctx, diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c index 86cae383ff..a854ac8857 100644 --- a/source4/torture/raw/qfileinfo.c +++ b/source4/torture/raw/qfileinfo.c @@ -23,7 +23,7 @@ #include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" static struct { diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c index 3b165b57ce..640164316e 100644 --- a/source4/torture/rpc/alter_context.c +++ b/source4/torture/rpc/alter_context.c @@ -22,7 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_dssetup.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" bool torture_rpc_alter_context(struct torture_context *torture) { diff --git a/source4/torture/rpc/async_bind.c b/source4/torture/rpc/async_bind.c index 6669aa27c1..03ff058edb 100644 --- a/source4/torture/rpc/async_bind.c +++ b/source4/torture/rpc/async_bind.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /* This test initiates multiple rpc bind requests and verifies diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c index 52bb64b9d4..34058f52a1 100644 --- a/source4/torture/rpc/atsvc.c +++ b/source4/torture/rpc/atsvc.c @@ -20,7 +20,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_atsvc_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" static bool test_JobGetInfo(struct dcerpc_pipe *p, struct torture_context *tctx, uint32_t job_id) { diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c index ee76ddd05b..abb09d42c9 100644 --- a/source4/torture/rpc/autoidl.c +++ b/source4/torture/rpc/autoidl.c @@ -22,7 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "librpc/ndr/ndr_table.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #if 1 diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c index 74fb9397b2..88825c5daa 100644 --- a/source4/torture/rpc/bench.c +++ b/source4/torture/rpc/bench.c @@ -21,7 +21,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /**************************/ /* srvsvc_NetShare */ diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c index 73978e4cec..236ef2942a 100644 --- a/source4/torture/rpc/bind.c +++ b/source4/torture/rpc/bind.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /* This test is 'bogus' in that it doesn't actually perform to the diff --git a/source4/torture/rpc/browser.c b/source4/torture/rpc/browser.c index 34eaf52f18..b039b0fcc8 100644 --- a/source4/torture/rpc/browser.c +++ b/source4/torture/rpc/browser.c @@ -21,7 +21,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_browser_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" bool test_BrowserrQueryOtherDomains(struct torture_context *tctx, struct dcerpc_pipe *p) diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c index 3a4bbd99f0..e49ba6fa39 100644 --- a/source4/torture/rpc/countcalls.c +++ b/source4/torture/rpc/countcalls.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/ndr/libndr.h" #include "librpc/ndr/ndr_table.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index 33272237b6..8c06859265 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_dfs_c.h" #include "libnet/libnet.h" #include "torture/util.h" diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 9ecd30bf17..a76ecabf22 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #define TEST_MACHINE_NAME "torturetest" diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index 7078dde0bc..58ce4f728a 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "ldb/include/ldb.h" #include "libcli/security/security.h" diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c index acf93e8785..0184905f59 100644 --- a/source4/torture/rpc/dsgetinfo.c +++ b/source4/torture/rpc/dsgetinfo.c @@ -30,7 +30,7 @@ #include "param/param.h" #include "dsdb/samdb/samdb.h" #include "lib/ldb_wrap.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "torture/drs/proto.h" diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c index f4947ff7c4..f8b0ef3491 100644 --- a/source4/torture/rpc/dssetup.c +++ b/source4/torture/rpc/dssetup.c @@ -21,7 +21,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_dssetup_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" bool test_DsRoleGetPrimaryDomainInformation_ext(struct torture_context *tctx, diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 793ab14dbf..c7910862f0 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -31,7 +31,7 @@ #include "param/param.h" #include "dsdb/samdb/samdb.h" #include "lib/ldb_wrap.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "torture/drs/proto.h" #include "lib/tsocket/tsocket.h" #include "libcli/resolve/resolve.h" diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c index b55e9d1d7f..3b19d5a6b4 100644 --- a/source4/torture/rpc/echo.c +++ b/source4/torture/rpc/echo.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "lib/events/events.h" #include "librpc/gen_ndr/ndr_echo_c.h" diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 024ef3e9f0..6a1c987de1 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -22,7 +22,7 @@ #include "librpc/gen_ndr/ndr_epmapper_c.h" #include "librpc/ndr/ndr_table.h" #include "librpc/rpc/dcerpc_proto.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /* diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c index 176dfbbb06..1fcc0a6f3f 100644 --- a/source4/torture/rpc/eventlog.c +++ b/source4/torture/rpc/eventlog.c @@ -23,7 +23,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_eventlog.h" #include "librpc/gen_ndr/ndr_eventlog_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #define TEST_BACKUP_NAME "samrtorturetest" diff --git a/source4/torture/rpc/frsapi.c b/source4/torture/rpc/frsapi.c index 74b5f06347..e56dd5822b 100644 --- a/source4/torture/rpc/frsapi.c +++ b/source4/torture/rpc/frsapi.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_frsapi_c.h" #include "param/param.h" diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c index 4e78e0a001..747629282c 100644 --- a/source4/torture/rpc/handles.c +++ b/source4/torture/rpc/handles.c @@ -23,7 +23,7 @@ #include "librpc/gen_ndr/ndr_samr_c.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "librpc/gen_ndr/ndr_drsuapi_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /* this tests the use of policy handles between connections diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c index 5b1035a3ab..c314c6dbc9 100644 --- a/source4/torture/rpc/initshutdown.c +++ b/source4/torture/rpc/initshutdown.c @@ -21,7 +21,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_initshutdown_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" static void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s) { diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c index 1d08c60915..b02510930a 100644 --- a/source4/torture/rpc/join.c +++ b/source4/torture/rpc/join.c @@ -1,7 +1,7 @@ #include "includes.h" #include "libcli/libcli.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libcli/resolve/resolve.h" #include "param/param.h" diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 7dd2cef19f..30c7a24e6f 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -27,7 +27,7 @@ #include "lib/events/events.h" #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #include "../lib/crypto/crypto.h" #define TEST_MACHINENAME "lsatestmach" diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c index baeb95c3ea..88834176cd 100644 --- a/source4/torture/rpc/lsa_lookup.c +++ b/source4/torture/rpc/lsa_lookup.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "libcli/security/security.h" diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c index 02fee16e55..fa30ee154f 100644 --- a/source4/torture/rpc/mgmt.c +++ b/source4/torture/rpc/mgmt.c @@ -22,7 +22,7 @@ #include "librpc/gen_ndr/ndr_mgmt_c.h" #include "auth/gensec/gensec.h" #include "librpc/ndr/ndr_table.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 5b3bcff3ff..781fdf060b 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -25,7 +25,7 @@ #include "includes.h" #include "lib/events/events.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "../lib/crypto/crypto.h" #include "libcli/auth/libcli_auth.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" diff --git a/source4/torture/rpc/ntsvcs.c b/source4/torture/rpc/ntsvcs.c index 2a7de2f71a..5007f1d28a 100644 --- a/source4/torture/rpc/ntsvcs.c +++ b/source4/torture/rpc/ntsvcs.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_ntsvcs_c.h" static bool test_PNP_GetVersion(struct torture_context *tctx, diff --git a/source4/torture/rpc/object_uuid.c b/source4/torture/rpc/object_uuid.c index 43c8713452..e2320bf4d2 100644 --- a/source4/torture/rpc/object_uuid.c +++ b/source4/torture/rpc/object_uuid.c @@ -22,7 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_dssetup.h" #include "librpc/gen_ndr/ndr_lsa.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /* this tests the send object uuids in the dcerpc request diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index a2fc484a44..eb3bc84b88 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -22,7 +22,7 @@ #include "librpc/gen_ndr/ndr_oxidresolver_c.h" #include "librpc/gen_ndr/ndr_remact_c.h" #include "librpc/gen_ndr/epmapper.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9" diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c index 9732555207..56c21b4e7e 100644 --- a/source4/torture/rpc/remact.c +++ b/source4/torture/rpc/remact.c @@ -21,7 +21,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_remact_c.h" #include "librpc/gen_ndr/ndr_epmapper_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9" #define DCERPC_IUNKNOWN_UUID "00000000-0000-0000-c000-000000000046" diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c index 81d2413239..eab835aad1 100644 --- a/source4/torture/rpc/remote_pac.c +++ b/source4/torture/rpc/remote_pac.c @@ -23,7 +23,7 @@ #include "auth/auth.h" #include "auth/gensec/gensec.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libcli/auth/libcli_auth.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" #include "param/param.h" diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index b05799125c..cfaeb5656d 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -20,7 +20,7 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "torture/smbtorture.h" #include "librpc/ndr/ndr_table.h" #include "../lib/util/dlinklist.h" diff --git a/source4/torture/rpc/rpc.h b/source4/torture/rpc/rpc.h deleted file mode 100644 index 8640b56720..0000000000 --- a/source4/torture/rpc/rpc.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB torture tester - Copyright (C) Andrew Tridgell 1997-2003 - Copyright (C) Jelmer Vernooij 2006 - - 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 . -*/ - -#ifndef __TORTURE_RPC_H__ -#define __TORTURE_RPC_H__ - -#include "lib/torture/torture.h" -#include "auth/credentials/credentials.h" -#include "torture/rpc/drsuapi.h" -#include "libnet/libnet_join.h" -#include "librpc/rpc/dcerpc.h" -#include "libcli/raw/libcliraw.h" -#include "librpc/gen_ndr/ndr_spoolss.h" -#include "torture/rpc/proto.h" - -struct torture_rpc_tcase { - struct torture_tcase tcase; - const struct ndr_interface_table *table; - const char *machine_name; -}; - -struct torture_rpc_tcase_data { - struct test_join *join_ctx; - struct dcerpc_pipe *pipe; - struct cli_credentials *credentials; -}; - -NTSTATUS torture_rpc_connection(struct torture_context *tctx, - struct dcerpc_pipe **p, - const struct ndr_interface_table *table); - -struct test_join *torture_join_domain(struct torture_context *tctx, - const char *machine_name, - uint32_t acct_flags, - struct cli_credentials **machine_credentials); -const struct dom_sid *torture_join_sid(struct test_join *join); -void torture_leave_domain(struct torture_context *tctx, struct test_join *join); -struct torture_rpc_tcase *torture_suite_add_rpc_iface_tcase(struct torture_suite *suite, - const char *name, - const struct ndr_interface_table *table); - -struct torture_test *torture_rpc_tcase_add_test( - struct torture_rpc_tcase *tcase, - const char *name, - bool (*fn) (struct torture_context *, struct dcerpc_pipe *)); -struct torture_rpc_tcase *torture_suite_add_anon_rpc_iface_tcase(struct torture_suite *suite, - const char *name, - const struct ndr_interface_table *table); - -struct torture_test *torture_rpc_tcase_add_test_ex( - struct torture_rpc_tcase *tcase, - const char *name, - bool (*fn) (struct torture_context *, struct dcerpc_pipe *, - void *), - void *userdata); -struct torture_rpc_tcase *torture_suite_add_machine_bdc_rpc_iface_tcase( - struct torture_suite *suite, - const char *name, - const struct ndr_interface_table *table, - const char *machine_name); -struct torture_rpc_tcase *torture_suite_add_machine_workstation_rpc_iface_tcase( - struct torture_suite *suite, - const char *name, - const struct ndr_interface_table *table, - const char *machine_name); -struct torture_test *torture_rpc_tcase_add_test_creds( - struct torture_rpc_tcase *tcase, - const char *name, - bool (*fn) (struct torture_context *, struct dcerpc_pipe *, struct cli_credentials *)); -bool torture_suite_init_rpc_tcase(struct torture_suite *suite, - struct torture_rpc_tcase *tcase, - const char *name, - const struct ndr_interface_table *table); - - - -#endif /* __TORTURE_RPC_H__ */ diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 274ddd9ea8..f93557f6fb 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -33,7 +33,7 @@ #include "librpc/gen_ndr/ndr_winreg_c.h" #include "librpc/gen_ndr/ndr_wkssvc_c.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libcli/libcli.h" #include "libcli/smb_composite/smb_composite.h" #include "libcli/auth/libcli_auth.h" diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 7282750c97..2da0041c73 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -27,7 +27,7 @@ #include "librpc/gen_ndr/ndr_samr_c.h" #include "../lib/crypto/crypto.h" #include "lib/cmdline/popt_common.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "param/param.h" diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index a0a5e5f6d9..094e10c597 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -32,7 +32,7 @@ #include "../lib/crypto/crypto.h" #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #include "auth/gensec/gensec.h" #include "auth/gensec/gensec_proto.h" diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c index fc331e2d85..1bdfe22783 100644 --- a/source4/torture/rpc/samr_accessmask.c +++ b/source4/torture/rpc/samr_accessmask.c @@ -21,7 +21,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_samr_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #include "libcli/security/security.h" diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index dcb1c4b0f7..e59bf3a3a8 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -25,7 +25,7 @@ #include "../lib/util/dlinklist.h" #include "../lib/crypto/crypto.h" #include "system/time.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "libcli/samsync/samsync.h" diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c index c176c3d6f1..090ff74078 100644 --- a/source4/torture/rpc/scanner.c +++ b/source4/torture/rpc/scanner.c @@ -22,7 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_mgmt_c.h" #include "librpc/ndr/ndr_table.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" /* diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index 376f01d5aa..ce903bd7b3 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -24,7 +24,7 @@ #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 "torture/rpc/torture_rpc.h" #include "lib/cmdline/popt_common.h" #include "../libcli/auth/schannel.h" #include "libcli/auth/libcli_auth.h" diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c index 1473a637d9..e782e5e321 100644 --- a/source4/torture/rpc/session_key.c +++ b/source4/torture/rpc/session_key.c @@ -23,7 +23,7 @@ #include "librpc/gen_ndr/ndr_lsa_c.h" #include "libcli/auth/libcli_auth.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "lib/cmdline/popt_common.h" #include "param/param.h" diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 78eb5c4475..fb8760ef2b 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -29,7 +29,7 @@ #include "librpc/gen_ndr/ndr_winreg_c.h" #include "librpc/gen_ndr/ndr_security.h" #include "libcli/security/security.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #include "lib/registry/registry.h" diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index 8cae6c911d..2dffa85557 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -24,7 +24,7 @@ #include "system/filesys.h" #include "librpc/gen_ndr/ndr_spoolss_c.h" #include "librpc/gen_ndr/ndr_spoolss.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "rpc_server/dcerpc_server.h" #include "rpc_server/service_rpc.h" #include "smbd/process_model.h" diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c index 0fb00e1698..384dda3938 100644 --- a/source4/torture/rpc/spoolss_win.c +++ b/source4/torture/rpc/spoolss_win.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_spoolss_c.h" #include "librpc/gen_ndr/ndr_misc.h" #include "ntvfs/ntvfs.h" diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 9bcc95b191..4137052326 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -20,7 +20,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" /**************************/ /* srvsvc_NetCharDev */ diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c index 23bf4399fa..47efb77bfb 100644 --- a/source4/torture/rpc/svcctl.c +++ b/source4/torture/rpc/svcctl.c @@ -22,7 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_svcctl_c.h" #include "librpc/gen_ndr/ndr_svcctl.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #define TORTURE_DEFAULT_SERVICE "Spooler" diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 919ba207ff..1f9064e0de 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -32,7 +32,7 @@ #include "librpc/gen_ndr/ndr_samr_c.h" #include "libcli/auth/libcli_auth.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "libcli/security/security.h" #include "param/param.h" diff --git a/source4/torture/rpc/torture_rpc.h b/source4/torture/rpc/torture_rpc.h new file mode 100644 index 0000000000..8640b56720 --- /dev/null +++ b/source4/torture/rpc/torture_rpc.h @@ -0,0 +1,94 @@ +/* + Unix SMB/CIFS implementation. + SMB torture tester + Copyright (C) Andrew Tridgell 1997-2003 + Copyright (C) Jelmer Vernooij 2006 + + 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 . +*/ + +#ifndef __TORTURE_RPC_H__ +#define __TORTURE_RPC_H__ + +#include "lib/torture/torture.h" +#include "auth/credentials/credentials.h" +#include "torture/rpc/drsuapi.h" +#include "libnet/libnet_join.h" +#include "librpc/rpc/dcerpc.h" +#include "libcli/raw/libcliraw.h" +#include "librpc/gen_ndr/ndr_spoolss.h" +#include "torture/rpc/proto.h" + +struct torture_rpc_tcase { + struct torture_tcase tcase; + const struct ndr_interface_table *table; + const char *machine_name; +}; + +struct torture_rpc_tcase_data { + struct test_join *join_ctx; + struct dcerpc_pipe *pipe; + struct cli_credentials *credentials; +}; + +NTSTATUS torture_rpc_connection(struct torture_context *tctx, + struct dcerpc_pipe **p, + const struct ndr_interface_table *table); + +struct test_join *torture_join_domain(struct torture_context *tctx, + const char *machine_name, + uint32_t acct_flags, + struct cli_credentials **machine_credentials); +const struct dom_sid *torture_join_sid(struct test_join *join); +void torture_leave_domain(struct torture_context *tctx, struct test_join *join); +struct torture_rpc_tcase *torture_suite_add_rpc_iface_tcase(struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table); + +struct torture_test *torture_rpc_tcase_add_test( + struct torture_rpc_tcase *tcase, + const char *name, + bool (*fn) (struct torture_context *, struct dcerpc_pipe *)); +struct torture_rpc_tcase *torture_suite_add_anon_rpc_iface_tcase(struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table); + +struct torture_test *torture_rpc_tcase_add_test_ex( + struct torture_rpc_tcase *tcase, + const char *name, + bool (*fn) (struct torture_context *, struct dcerpc_pipe *, + void *), + void *userdata); +struct torture_rpc_tcase *torture_suite_add_machine_bdc_rpc_iface_tcase( + struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table, + const char *machine_name); +struct torture_rpc_tcase *torture_suite_add_machine_workstation_rpc_iface_tcase( + struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table, + const char *machine_name); +struct torture_test *torture_rpc_tcase_add_test_creds( + struct torture_rpc_tcase *tcase, + const char *name, + bool (*fn) (struct torture_context *, struct dcerpc_pipe *, struct cli_credentials *)); +bool torture_suite_init_rpc_tcase(struct torture_suite *suite, + struct torture_rpc_tcase *tcase, + const char *name, + const struct ndr_interface_table *table); + + + +#endif /* __TORTURE_RPC_H__ */ diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c index 8ccbd2b081..58c9755e56 100644 --- a/source4/torture/rpc/unixinfo.c +++ b/source4/torture/rpc/unixinfo.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "librpc/gen_ndr/ndr_unixinfo_c.h" #include "libcli/security/security.h" diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index 461deff2d0..3da8c9125a 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -24,7 +24,7 @@ #include "librpc/gen_ndr/ndr_winreg_c.h" #include "librpc/gen_ndr/ndr_security.h" #include "libcli/security/security.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "param/param.h" #include "lib/registry/registry.h" diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c index 33789941bc..a8556c58cf 100644 --- a/source4/torture/rpc/wkssvc.c +++ b/source4/torture/rpc/wkssvc.c @@ -22,7 +22,7 @@ #include "includes.h" #include "torture/torture.h" #include "librpc/gen_ndr/ndr_wkssvc_c.h" -#include "torture/rpc/rpc.h" +#include "torture/rpc/torture_rpc.h" #include "lib/cmdline/popt_common.h" #include "param/param.h" #include "../lib/crypto/crypto.h" -- cgit