From ffeee68e4b72dd94fee57366bd8d38b8c284c3d4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Sep 2007 12:42:09 +0000 Subject: r25026: Move param/param.h out of includes.h (This used to be commit abe8349f9b4387961ff3665d8c589d61cd2edf31) --- source4/torture/rpc/bench.c | 1 + source4/torture/rpc/countcalls.c | 1 + source4/torture/rpc/dfs.c | 2 +- source4/torture/rpc/drsuapi.c | 1 + source4/torture/rpc/drsuapi_cracknames.c | 2 +- source4/torture/rpc/dssync.c | 1 + source4/torture/rpc/lsa.c | 1 + source4/torture/rpc/mgmt.c | 1 + source4/torture/rpc/netlogon.c | 1 + source4/torture/rpc/samba3rpc.c | 1 + source4/torture/rpc/samlogon.c | 1 + source4/torture/rpc/samr.c | 1 + source4/torture/rpc/samsync.c | 1 + source4/torture/rpc/scanner.c | 1 + source4/torture/rpc/schannel.c | 1 + source4/torture/rpc/session_key.c | 1 + source4/torture/rpc/spoolss_notify.c | 1 + source4/torture/rpc/testjoin.c | 1 + 18 files changed, 18 insertions(+), 2 deletions(-) (limited to 'source4/torture/rpc') diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c index 48fd0609f0..be00e0b7a6 100644 --- a/source4/torture/rpc/bench.c +++ b/source4/torture/rpc/bench.c @@ -23,6 +23,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" #include "torture/rpc/rpc.h" +#include "param/param.h" /**************************/ /* srvsvc_NetShare */ diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c index e2e222d2ec..c1fdc069cb 100644 --- a/source4/torture/rpc/countcalls.c +++ b/source4/torture/rpc/countcalls.c @@ -25,6 +25,7 @@ #include "librpc/ndr/libndr.h" #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" +#include "param/param.h" diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index 7dc600ae93..19df14c772 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -487,7 +487,7 @@ bool torture_rpc_dfs(struct torture_context *torture) struct dcerpc_pipe *p; BOOL ret = True; enum dfs_ManagerVersion version; - const char *host = lp_parm_string(-1, "torture", "host"); + const char *host = torture_setting_string(torture, "host", NULL); status = torture_rpc_connection(torture, &p, &ndr_table_netdfs); torture_assert_ntstatus_ok(torture, status, "Unable to connect"); diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 08420d0d17..c3ec54cbcd 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_drsuapi_c.h" #include "torture/rpc/rpc.h" #include "dlinklist.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 b1a65179aa..08c102c400 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -447,7 +447,7 @@ bool test_DsCrackNames(struct torture_context *tctx, .comment = "display name for Microsoft Support Account", .status = DRSUAPI_DS_NAME_STATUS_OK, .alternate_status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE, - .skip = lp_parm_bool(-1, "torture", "samba4", False) + .skip = torture_setting_bool(tctx, "samba4", False) }, { .format_offered = DRSUAPI_DS_NAME_FORMAT_GUID, diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 6357fa9ee5..bf3e59c380 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -32,6 +32,7 @@ #include "auth/credentials/credentials.h" #include "libcli/auth/libcli_auth.h" #include "auth/gensec/gensec.h" +#include "param/param.h" struct DsSyncBindInfo { struct dcerpc_pipe *pipe; diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index cfdf483f8d..46660231f8 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -27,6 +27,7 @@ #include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" #include "torture/rpc/rpc.h" +#include "param/param.h" static void init_lsa_String(struct lsa_String *name, const char *s) { diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c index 6d0c3d56c9..40a3438492 100644 --- a/source4/torture/rpc/mgmt.c +++ b/source4/torture/rpc/mgmt.c @@ -24,6 +24,7 @@ #include "auth/gensec/gensec.h" #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" +#include "param/param.h" /* diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 7a94ef7645..907772ac8a 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -30,6 +30,7 @@ #include "libcli/auth/libcli_auth.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" #include "librpc/gen_ndr/ndr_lsa_c.h" +#include "param/param.h" #define TEST_MACHINE_NAME "torturetest" diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 72eba40344..73bb12de87 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -48,6 +48,7 @@ #include "libcli/auth/libcli_auth.h" #include "lib/crypto/crypto.h" #include "libcli/security/proto.h" +#include "param/param.h" static struct cli_credentials *create_anon_creds(TALLOC_CTX *mem_ctx) { diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index da74067336..b149af1859 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -31,6 +31,7 @@ #include "torture/rpc/rpc.h" #include "auth/gensec/schannel_proto.h" #include "libcli/auth/libcli_auth.h" +#include "param/param.h" #define TEST_MACHINE_NAME "samlogontest" #define TEST_USER_NAME "samlogontestuser" diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index dada316a39..757142003a 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -28,6 +28,7 @@ #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" #include "torture/rpc/rpc.h" +#include "param/param.h" #define TEST_ACCOUNT_NAME "samrtorturetest" #define TEST_ALIASNAME "samrtorturetestalias" diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 358bf8791a..baf4edca98 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -36,6 +36,7 @@ #include "librpc/gen_ndr/ndr_lsa_c.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "librpc/gen_ndr/ndr_security.h" +#include "param/param.h" #define TEST_MACHINE_NAME "samsynctest" #define TEST_WKSTA_MACHINE_NAME "samsynctest2" diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c index e1d7c69676..c070a47754 100644 --- a/source4/torture/rpc/scanner.c +++ b/source4/torture/rpc/scanner.c @@ -24,6 +24,7 @@ #include "librpc/gen_ndr/ndr_mgmt_c.h" #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" +#include "param/param.h" /* work out how many calls there are for an interface diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index e6bc00312a..2494fbefff 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -30,6 +30,7 @@ #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" #include "system/filesys.h" +#include "param/param.h" #define TEST_MACHINE_NAME "schannel" diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c index d35d9fd4fc..0e1c2666f8 100644 --- a/source4/torture/rpc/session_key.c +++ b/source4/torture/rpc/session_key.c @@ -26,6 +26,7 @@ #include "libcli/auth/libcli_auth.h" #include "torture/rpc/rpc.h" #include "lib/cmdline/popt_common.h" +#include "param/param.h" static void init_lsa_String(struct lsa_String *name, const char *s) { diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index 43955888f5..c6fb71c465 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -31,6 +31,7 @@ #include "lib/socket/netif.h" #include "dlinklist.h" #include "ntvfs/ntvfs.h" +#include "param/param.h" static NTSTATUS spoolss__op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface) { diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 56a0fccde4..e20699cc04 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -36,6 +36,7 @@ #include "libcli/auth/libcli_auth.h" #include "torture/rpc/rpc.h" #include "libcli/security/security.h" +#include "param/param.h" struct test_join { struct dcerpc_pipe *p; -- cgit