[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Apr 14 13:48:13 MDT 2010
The branch, master has been updated
via e1e2195... s4:torture/rpc: rename rpc.h => torture_rpc.h
from bcd647f... Merge branch 'master' of ssh://git.samba.org/data/git/samba
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e1e2195a4ab60a74ca0a11f8eeb0ba1abfbb37a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 13 22:06:51 2010 +0200
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
-----------------------------------------------------------------------
Summary of changes:
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/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/{rpc.h => torture_rpc.h} | 0
source4/torture/rpc/unixinfo.c | 2 +-
source4/torture/rpc/winreg.c | 2 +-
source4/torture/rpc/wkssvc.c | 2 +-
66 files changed, 65 insertions(+), 65 deletions(-)
rename source4/torture/rpc/{rpc.h => torture_rpc.h} (100%)
Changeset truncated at 500 lines:
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 110a2e8..11a006e 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 6b58ddf..affd1e5 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 e2b5657..7788ee8 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 562be4f..dd9e173 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 a8e0842..5b747b0 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 d1148f0..10d1f1c 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 832a7e5..128442a 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 d4a87a8..5403394 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 3c0bc53..95b6bce 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 89367b9..140282b 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 7db04e4..aa5b8e8 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 b16a09c..c1d67fb 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 606d218..564c601 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 ed1bd57..09aaa41 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 49b95e2..bf631f4 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 68a1062..5ac468c 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 86cae38..a854ac8 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 3b165b5..6401643 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 6669aa2..03ff058 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 52bb64b..34058f5 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 ee76ddd..abb09d4 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 74fb939..88825c5 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 73978e4..236ef29 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 34eaf52..b039b0f 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 3a4bbd9..e49ba6f 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 3327223..8c06859 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 9ecd30b..a76ecab 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 7078dde..58ce4f7 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 acf93e8..0184905 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 f4947ff..f8b0ef3 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 793ab14..c791086 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 b55e9d1..3b19d5a 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 024ef3e..6a1c987 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 176dfbb..1fcc0a6 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 74b5f06..e56dd58 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 4e78e0a..7476292 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 5b1035a..c314c6d 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 1d08c60..b025109 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 7dd2cef..30c7a24 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -27,7 +27,7 @@
#include "lib/events/events.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list