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 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source4/torture/libnet') 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" -- cgit