s4:torture/rpc: rename rpc.h => torture_rpc.h

The reason for this is that some systems include
<rpc/rpc.h> from within system headers. HP-UX 11.00
does so somewhere deep inside of <shadow.h>.

For torture/winbind/struct_based.c <rpc/rpc.h> resolves
to torture/rpc/rpc.h and breaks the build.

metze

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 110a2e8f99b175df40a851915e299e01cf0131ab..11a006e42d208d2e4f14f5b24b47dcabd357ad9b 100644 (file)
--- 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 6b58ddf0f542c3c130b9270078843c84deb2315e..affd1e5f964bbeea358205e90d6c3b4aa7a2733d 100644 (file)
--- 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 e2b565735a6594bd58cd0886bd00b4ee4d39cc2b..7788ee85c37ebadf641b226a32f0f1bcf5793d0f 100644 (file)
--- 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 562be4fc3952b7075036fd63043aef7301f7a0a5..dd9e173b54f365ae3cf0027998522e192c6e6f2b 100644 (file)
--- 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 a8e0842bd2cabfbbc1f6b39fb6229a0e6fb5dcdb..5b747b06dad567621ae2b1b339a86f3729cc538b 100644 (file)
--- 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 d1148f0d23cd00580789ee10595daa7d44dd471a..10d1f1cf500821da3d40a6a038f9cf8bf60628f8 100644 (file)
--- 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 832a7e5f848c5ad7be74986678d2e4b5c849f878..128442a0709d29f0150df78a0330edff6538b4ff 100644 (file)
--- 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 d4a87a8f267364674a97407d34a76dcf75f89fa0..54033947405941276e7bd261b3c7a9dc3ff66ee4 100644 (file)
--- 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 3c0bc5320c39b87403aa247a7852d2f0e4c83733..95b6bceff6e8eb101ed7b4339f97b322419bf052 100644 (file)
--- 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 89367b90a35338cfd3e2ca8393b2edbdf78fe3f0..140282bd2bbdc6fdc4648dea3cc83a33932b4d24 100644 (file)
--- 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 7db04e4d3826b9b6d43bdb5e44c1744fb90dc4e1..aa5b8e8ccf69931f20ad5b7560efde1f7a4b55ff 100644 (file)
--- 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 b16a09cbe88f2be3891a9c93198c0b59f25be489..c1d67fb8b6c37a4a940f9d2bb3de52f8cb04fbd3 100644 (file)
--- 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 606d218bba2562fcfd490ee37cad4ff31fe48665..564c601455e0993ffaeaf7af5ebe3b837f01d9b7 100644 (file)
--- 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 ed1bd57bd115eefc46fcbbb829f2130bda932c0e..09aaa41c68e0821d63d98b94ede68d90d8dcba29 100644 (file)
--- 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 49b95e2d4fb2e030e05a42e9ce9bb456b677f8c4..bf631f4445a6a788190caec62c425f7c90bdf3eb 100644 (file)
--- 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 68a106278db816d4dc4b348c9ad2162148032c24..5ac468c21285c13c9925d802a9fc1d7b6b65fc92 100644 (file)
--- 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 86cae383ffb82152bac1fe28508ffc412cc96524..a854ac8857f951356546dd37fbb8ef2e24a5a65e 100644 (file)
--- 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 3b165b57cecbfb17b37ca2d72e6a2d10bdaf190d..640164316e626a539109282a34253acafb4c0e40 100644 (file)
--- 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 6669aa27c13c7bf204f98e2d0b78484e3c38a519..03ff058edb07b4b96d815772e86583b71e11ee03 100644 (file)
--- 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 52bb64b9d4faca32d7008b4bbe627fb903c24e2a..34058f52a17a6ca343931100eae6d70dce25073c 100644 (file)
--- 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 ee76ddd05b8d7bbf13d6bfc54a53182a14c8da91..abb09d42c979569a910bb925960128b05f3df1fd 100644 (file)
--- 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 74fb9397b2f5d79cbeefc8da2b102d5535b00675..88825c5daaeb8f2647f77cc6efd8f95d961cfa38 100644 (file)
--- 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 73978e4cec909f08307468873665bc311b129f4f..236ef2942a6026ef43277d9c8f997d6c086f3a03 100644 (file)
--- 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 34eaf52f182d06e6be290a6d5ff0b402981f0a44..b039b0fcc8e9f61a32c0beb3790b12a82050b37f 100644 (file)
--- 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 3a4bbd99f0491571ad3f071425802892c8eaa0e4..e49ba6fa397a293bcba4da3f31af06a40ed195bc 100644 (file)
--- 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 33272237b62d3cb99d0f4ddb002641ddb92447ca..8c06859265f952409355b2498ee075cdd9ac32b6 100644 (file)
--- 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 9ecd30bf17342f425a61a1292b513ed7ebf5c04b..a76ecabf22b0f4480b133db939580a887266f040 100644 (file)
--- 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 7078dde0bc1d8f03355e77ba225a694425cdb291..58ce4f728a136d80178a23a2856933e2d5c5ef46 100644 (file)
--- 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 acf93e878514f26bf2c79a756c535f767de2f444..0184905f5941a9ca3f3ae25691f754a349f5c101 100644 (file)
--- 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 f4947ff7c40dc5349606addaf0c223161647a069..f8b0ef34915740ba4afdf011ab947ad0e6ee19d7 100644 (file)
--- 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 793ab14dbf044cf902225fccfb255475576aaf11..c7910862f003c5e864831b6274c54c7529eeb184 100644 (file)
--- 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 b55e9d1d7f21728f8f4335579996c54ebfd8c7f8..3b19d5a6b46eb4ade91469ddfa17007179fb921a 100644 (file)
--- 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 024ef3e9f07ffcbbb71f267f1b0b86ead61329db..6a1c987de1d9c43c6d4e50f4d7f48dcc5b78bc1a 100644 (file)
--- 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 176dfbbb06e3267bc8ef695714c557d85a98339a..1fcc0a6f3f85345138ea8ea1c469c2bde6f03692 100644 (file)
--- 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 74b5f063477f8abbdf59b8e6e42ec1ab4f2f80dd..e56dd5822baf0de15723a41d3b19a87fbb8b9e22 100644 (file)
--- 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 4e78e0a0018086114e7c6f5ba7e382982b1e94df..747629282c3197013ed1b41a0f826b107a6bda7a 100644 (file)
--- 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 5b1035a3abd65a1203277d5db4772e0285808a07..c314c6dbc9fad290ed41431cf7a4a06db4030e4a 100644 (file)
--- 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 1d08c60915501920ebf4fcf79e7adbbd866302ea..b02510930abaaf653a1470845e7d78c2b69f691c 100644 (file)
--- 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 7dd2cef19fa4ecbfbf9e9f28b48137187ac6b165..30c7a24e6f867dd07c0eb10fa77d0463f3a51808 100644 (file)
--- 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 baeb95c3ea74528b6369c46c60778eb20bc31553..88834176cd1c5e069b7bbf2cac1698ab5c31697e 100644 (file)
--- 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 02fee16e55eb2454e046b7d071977d9c0cd6142f..fa30ee154fe93c54dbc1a1794b53494d1c62ca38 100644 (file)
--- 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 5b3bcff3ff6e35da05975422ee0363565800d943..781fdf060b16c19b1828ec04d3507d92b6bebe8b 100644 (file)
--- 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 2a7de2f71a4e0c9f8fd73b9f1042c12fe7d62a9f..5007f1d28a3e8c11e44d5220d488e3f88c1cb822 100644 (file)
--- 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 43c871345260f8233364844ad0ed95879f41ca16..e2320bf4d2adff49d9f13dae7e36140fc3d9b1aa 100644 (file)
--- 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 a2fc484a44b4bb8e804110cad8f1973e1a187bab..eb3bc84b88e3ea83ac1981012c09fe1d31f7d271 100644 (file)
--- 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 9732555207ff5e393487aefd287966818a910578..56c21b4e7e74cb4968b1245c9c1c2c3b0f254bb4 100644 (file)
--- 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 81d2413239c75664080b386c18e04e22de949f7b..eab835aad149cc9b528f46c2aff2c1d3a21fdfe8 100644 (file)
--- 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 b05799125cf637f62fe02d901ccfb3a2e29881ab..cfaeb5656d3474f944eacd1d76f024cf64382bc3 100644 (file)
--- 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/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 274ddd9ea802b61165367f6d8f291ed191210055..f93557f6fb39f129c71b48c8be771667a9db7095 100644 (file)
--- 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 7282750c97432d6f423acacdb001659fa4b41cd9..2da0041c73277cf929d939313d53942276ed73d1 100644 (file)
--- 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 a0a5e5f6d900cad50871d5e154402c78f82cfca9..094e10c5973c0ce17008ca59aa85bdea4009c3d7 100644 (file)
--- 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 fc331e2d855681425f2e1fcde6bd0729b5bdf95f..1bdfe22783d7551a62096c53d1cfa9a959493fe3 100644 (file)
--- 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 dcb1c4b0f78ec8699b8bf6159b732a4a9e36565d..e59bf3a3a80a487f5b74c077cdb94d334317a71a 100644 (file)
--- 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 c176c3d6f15b2119527df0e9f6f9f009a548f4ee..090ff7407833ef55a97ae103c86fb2d41c52849a 100644 (file)
--- 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 376f01d5aa6e0d1638f0dbe852dd52feb5e0ac95..ce903bd7b3813667db99a39f09ac87207ebb295a 100644 (file)
--- 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 1473a637d90bdaa9901f27d8d3dab37344659da1..e782e5e321a87d0da7088240b2fd7dbfef302303 100644 (file)
--- 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 78eb5c44757185a8a260c7d2a62791139d5a4206..fb8760ef2b1cb0cc85288730697682364d95eee9 100644 (file)
--- 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 8cae6c911dc40f7eff88c5f1d8bc4413c0994344..2dffa8555710e6899dec98f90e68fe4e0cbcf5f3 100644 (file)
--- 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 0fb00e1698d366d03fe0980d50a5d0d234507708..384dda39388921cac4353e38e7ab7f666a420761 100644 (file)
--- 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 9bcc95b191e4c3e1cd64a964b1df1ba8aefc9ae3..41370523262151bc0a60d70579d3e38ae47a5629 100644 (file)
--- 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 23bf4399fa35b81ffea47c246f46ccd6841bd94c..47efb77bfb67882fe25bc9c93c78c83d63e587c0 100644 (file)
--- 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 919ba207ffc6ea556dde5a2c53189576d84de0cc..1f9064e0de210d2ac89a11b5f5a5a846ec561431 100644 (file)
--- 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/rpc.h b/source4/torture/rpc/torture_rpc.h
similarity index 100%
rename from source4/torture/rpc/rpc.h
rename to source4/torture/rpc/torture_rpc.h

diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c
index 8ccbd2b081af8f7e5b320d97ad1b894db833e3de..58c9755e568890dfbf43d535699f37dc739bec72 100644 (file)
--- 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 461deff2d097dbde4377a43d697f26e3e4a17381..3da8c9125a33f02a3ba6b7d7634384ecd0cec928 100644 (file)
--- 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 33789941bca20a63c61e806143bd5385c9e7539e..a8556c58cf721c11aa44a741c56839d13cd55381 100644 (file)
--- 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"