r19392: Use torture_setting_* rather than lp_parm_* where possible.

(This used to be commit b28860978fe29c5b10abfb8c59d7182864e21dd6)

5 files changed, 8 insertions, 8 deletions

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 850bb4046f..98744e0ec2 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -769,7 +769,7 @@ BOOL torture_bench_oplock(struct torture_context *torture)
 	TALLOC_CTX *mem_ctx = talloc_new(torture);
 	extern int torture_nprocs;
 	int i, count=0;
-	int timelimit = lp_parm_int(-1, "torture", "timelimit", 10);
+	int timelimit = torture_setting_int(torture, "timelimit", 10);
 	union smb_open io;
 	struct timeval tv;
 	struct event_context *ev = event_context_find(mem_ctx);
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index ef99eb0103..bb27ba71e5 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -475,7 +475,7 @@ static BOOL test_readx(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	CHECK_STATUS(status, NT_STATUS_OK);
 	CHECK_VALUE(io.readx.out.remaining, 0xFFFF);
 	CHECK_VALUE(io.readx.out.compaction_mode, 0);
-	if (lp_parm_bool(-1, "target", "samba3", False)) {
+	if (lp_parm_bool(-1, "torture", "samba3", False)) {
 		printf("SAMBA3: ignore wrong nread[%d] should be [%d]\n",
 			io.readx.out.nread, 0);
 	} else {
diff --git a/source4/torture/raw/samba3hide.c b/source4/torture/raw/samba3hide.c
index da23cfb1f1..eed38eb772 100644
--- a/source4/torture/raw/samba3hide.c
+++ b/source4/torture/raw/samba3hide.c
@@ -136,8 +136,8 @@ BOOL torture_samba3_hide(struct torture_context *torture)
 	struct smbcli_tree *hideunwrite;
 
 	if (!torture_open_connection_share(
-		    torture, &cli, lp_parm_string(-1, "torture", "host"),
-		    lp_parm_string(-1, "torture", "share"), NULL)) {
+		    torture, &cli, torture_setting_string(torture, "host", NULL),
+		    torture_setting_string(torture, "share", NULL), NULL)) {
 		d_printf("torture_open_connection_share failed\n");
 		return False;
 	}
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index 0cbc7912ed..0b196b1587 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -53,8 +53,8 @@ BOOL torture_samba3_checkfsp(struct torture_context *torture)
 	}
 
 	if (!torture_open_connection_share(
-		    torture, &cli, lp_parm_string(-1, "torture", "host"),
-		    lp_parm_string(-1, "torture", "share"), NULL)) {
+		    torture, &cli, torture_setting_string(torture, "host", NULL),
+		    torture_setting_string(torture, "share", NULL), NULL)) {
 		d_printf("torture_open_connection_share failed\n");
 		ret = False;
 		goto done;
@@ -63,7 +63,7 @@ BOOL torture_samba3_checkfsp(struct torture_context *torture)
 	smbcli_deltree(cli->tree, dirname);
 
 	status = torture_second_tcon(torture, cli->session,
-				     lp_parm_string(-1, "torture", "share"),
+				     torture_setting_string(torture, "share", NULL),
 				     &tree2);
 	CHECK_STATUS(status, NT_STATUS_OK);
 	if (!NT_STATUS_IS_OK(status))
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 1bccb30094..8ad9189734 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -546,7 +546,7 @@ BOOL torture_raw_sfileinfo_bug(struct torture_context *torture)
 	NTSTATUS status;
 	int fnum;
 
-	if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
+	if (!torture_setting_bool(torture, "dangerous", False)) {
 		printf("torture_raw_sfileinfo_bug disabled - enable dangerous tests to use\n");
 		return True;
 	}