r24728: Use more stock torture functions.

(This used to be commit da3a7ee407a2b41bd01f45072cad12bf29250b33)

4 files changed, 5 insertions, 5 deletions

diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index 83462d3328..f8cd1cd488 100644
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -116,7 +116,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture)
 
 	torture_comment(torture, "RPC-HANDLE-LSARPC-SHARED\n");
 
-	if (lp_parm_bool(-1, "torture", "samba4", False)) {
+	if (torture_setting_bool(torture, "samba4", false)) {
 		torture_comment(torture, "LSA shared-policy-handle test against Samba4 - skipping\n");
 		return true;
 	}
@@ -399,7 +399,7 @@ static bool test_handles_mixed_shared(struct torture_context *torture)
 
 	torture_comment(torture, "RPC-HANDLE-MIXED-SHARED\n");
 
-	if (lp_parm_bool(-1, "torture", "samba4", False)) {
+	if (torture_setting_bool(torture, "samba4", false)) {
 		torture_comment(torture, "Mixed shared-policy-handle test against Samba4 - skipping\n");
 		return true;
 	}
diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index a2a30e285a..23c43c525e 100644
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -14,7 +14,7 @@ BOOL torture_rpc_join(struct torture_context *torture)
 	struct test_join *tj;
 	struct cli_credentials *machine_account;
 	struct smbcli_state *cli;
-	const char *host = lp_parm_string(-1, "torture", "host");
+	const char *host = torture_setting_string(torture, "host", NULL);
 
 	/* Join domain as a member server. */
 	tj = torture_join_domain(TORTURE_NETBIOS_NAME,
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index cf08e857de..6a40cc5e46 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -1409,7 +1409,7 @@ BOOL torture_rpc_samsync(struct torture_context *torture)
 	struct test_join *user_ctx;
 	const char *machine_password;
 	const char *wksta_machine_password;
-	const char *binding = lp_parm_string(-1, "torture", "binding");
+	const char *binding = torture_setting_string(torture, "binding", NULL);
 	struct dcerpc_binding *b;
 	struct dcerpc_binding *b_netlogon_wksta;
 	struct samr_Connect c;
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 416a469fc4..e072e592d1 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -497,7 +497,7 @@ BOOL torture_rpc_schannel2(struct torture_context *torture)
 	TALLOC_CTX *mem_ctx = talloc_new(torture);
 	struct test_join *join_ctx;
 	NTSTATUS status;
-	const char *binding = lp_parm_string(-1, "torture", "binding");
+	const char *binding = torture_setting_string(torture, "binding", NULL);
 	struct dcerpc_binding *b;
 	struct dcerpc_pipe *p1 = NULL, *p2 = NULL;
 	struct cli_credentials *credentials1, *credentials2;