r25392: Add loadparm context as argument in a couple more places.

(This used to be commit c62f51cc28a37959128e78a1f34cfd4c6d3ba069)

13 files changed, 45 insertions, 45 deletions

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index b6b1d021dc..7c9339dedc 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1445,7 +1445,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *tctx)
 
 	nt_status_support = lp_nt_status_support();
 
-	if (!lp_set_cmdline("nt status support", "yes")) {
+	if (!lp_set_cmdline(global_loadparm, "nt status support", "yes")) {
 		torture_comment(tctx, "Could not set 'nt status support = yes'\n");
 		goto fail;
 	}
@@ -1454,7 +1454,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *tctx)
 		goto fail;
 	}
 
-	if (!lp_set_cmdline("nt status support", "no")) {
+	if (!lp_set_cmdline(global_loadparm, "nt status support", "no")) {
 		torture_comment(tctx, "Could not set 'nt status support = yes'\n");
 		goto fail;
 	}
@@ -1463,7 +1463,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *tctx)
 		goto fail;
 	}
 
-	if (!lp_set_cmdline("nt status support",
+	if (!lp_set_cmdline(global_loadparm, "nt status support",
 			    nt_status_support ? "yes":"no")) {
 		torture_comment(tctx, "Could not reset 'nt status support = yes'");
 		goto fail;
diff --git a/source4/torture/local/irpc.c b/source4/torture/local/irpc.c
index e113b63804..ad1b22ca6f 100644
--- a/source4/torture/local/irpc.c
+++ b/source4/torture/local/irpc.c
@@ -215,7 +215,7 @@ static BOOL irpc_setup(struct torture_context *tctx, void **_data)
 
 	*_data = data = talloc(tctx, struct irpc_test_data);
 
-	lp_set_cmdline("pid directory", "piddir.tmp");
+	lp_set_cmdline(global_loadparm, "pid directory", "piddir.tmp");
 
 	data->ev = tctx->ev;
 	torture_assert(tctx, data->msg_ctx1 = 
diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c
index e70fd7c24d..6834c82fae 100644
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@@ -68,7 +68,7 @@ static bool test_ping_speed(struct torture_context *tctx)
 	uint32_t msg_ping, msg_exit;
 	TALLOC_CTX *mem_ctx = tctx;
 
-	lp_set_cmdline("pid directory", "piddir.tmp");
+	lp_set_cmdline(global_loadparm, "pid directory", "piddir.tmp");
 
 	ev = tctx->ev;
 
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index d18a1cb6e9..e99ff715a2 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -614,10 +614,10 @@ static void usage(void)
 			exact_error_codes = True;
 			break;
 		case 'l':
-			lp_set_cmdline("torture:unclist", optarg);
+			lp_set_cmdline(global_loadparm, "torture:unclist", optarg);
 			break;
 		case 'W':
-			lp_set_cmdline("workgroup", optarg);
+			lp_set_cmdline(global_loadparm, "workgroup", optarg);
 			break;
 		case 'h':
 			usage();
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 53cceb9699..9019bf913b 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -285,7 +285,7 @@ static void usage(void)
 
 	setup_logging("masktest", DEBUG_STDOUT);
 
-	lp_set_cmdline("log level", "0");
+	lp_set_cmdline(global_loadparm, "log level", "0");
 
 	if (argc < 2 || argv[1][0] == '-') {
 		usage();
@@ -325,7 +325,7 @@ static void usage(void)
 			verbose++;
 			break;
 		case 'M':
-			lp_set_cmdline("max protocol", optarg);
+			lp_set_cmdline(global_loadparm, "max protocol", optarg);
 			break;
 		case 'U':
 			cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED);
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index dacc9958be..5b2e0f8af8 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -892,7 +892,7 @@ bool torture_raw_context(struct torture_context *torture,
 	bool ret = true;
 	if (lp_use_spnego()) {
 		ret &= torture_raw_context_int(torture, cli);
-		lp_set_cmdline("use spnego", "False");
+		lp_set_cmdline(global_loadparm, "use spnego", "False");
 	}
 
 	ret &= torture_raw_context_int(torture, cli);
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index 3f6c552cb4..aad13ecd8f 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -346,7 +346,7 @@ bool torture_samba3_badpath(struct torture_context *torture)
 
 	nt_status_support = lp_nt_status_support();
 
-	if (!lp_set_cmdline("nt status support", "yes")) {
+	if (!lp_set_cmdline(global_loadparm, "nt status support", "yes")) {
 		printf("Could not set 'nt status support = yes'\n");
 		goto fail;
 	}
@@ -355,7 +355,7 @@ bool torture_samba3_badpath(struct torture_context *torture)
 		goto fail;
 	}
 
-	if (!lp_set_cmdline("nt status support", "no")) {
+	if (!lp_set_cmdline(global_loadparm, "nt status support", "no")) {
 		printf("Could not set 'nt status support = yes'\n");
 		goto fail;
 	}
@@ -364,7 +364,7 @@ bool torture_samba3_badpath(struct torture_context *torture)
 		goto fail;
 	}
 
-	if (!lp_set_cmdline("nt status support",
+	if (!lp_set_cmdline(global_loadparm, "nt status support",
 			    nt_status_support ? "yes":"no")) {
 		printf("Could not reset 'nt status support = yes'");
 		goto fail;
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 40a3438492..f27dcd7b05 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -228,7 +228,7 @@ BOOL torture_rpc_mgmt(struct torture_context *torture)
 			continue;
 		}
 
-		lp_set_cmdline("torture:binding", dcerpc_binding_string(loop_ctx, b));
+		lp_set_cmdline(global_loadparm, "torture:binding", dcerpc_binding_string(loop_ctx, b));
 
 		status = torture_rpc_connection(torture, &p, &ndr_table_mgmt);
 		if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index c070a47754..976279a817 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -131,7 +131,7 @@ bool torture_rpc_scanner(struct torture_context *torture)
 			b->endpoint = talloc_strdup(b, l->table->name);
 		}
 
-		lp_set_cmdline("torture:binding", dcerpc_binding_string(torture, b));
+		lp_set_cmdline(global_loadparm, "torture:binding", dcerpc_binding_string(torture, b));
 
 		status = torture_rpc_connection(torture, &p, &ndr_table_mgmt);
 		if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index ac65b80071..69dc8da6c1 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -148,9 +148,9 @@ static bool test_secrets(struct torture_context *torture, const void *_data)
 	const struct secret_settings *settings = 
 		(const struct secret_settings *)_data;
 
-	lp_set_cmdline("ntlmssp client:keyexchange", settings->keyexchange?"True":"False");
-	lp_set_cmdline("ntlmssp_client:ntlm2", settings->ntlm2?"True":"False");
-	lp_set_cmdline("ntlmssp_client:lm_key", settings->lm_key?"True":"False");
+	lp_set_cmdline(global_loadparm, "ntlmssp client:keyexchange", settings->keyexchange?"True":"False");
+	lp_set_cmdline(global_loadparm, "ntlmssp_client:ntlm2", settings->ntlm2?"True":"False");
+	lp_set_cmdline(global_loadparm, "ntlmssp_client:lm_key", settings->lm_key?"True":"False");
 
 	torture_assert_ntstatus_ok(torture, torture_rpc_binding(torture, &binding), 
 				   "Getting bindoptions");
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index c6fb71c465..e44c2a874b 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -224,7 +224,7 @@ static bool test_RFFPCNEx(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx, dcerpc_register_ep_server(&ep_server),
 				  "unable to register spoolss server");
 
-	lp_set_cmdline("dcerpc endpoint servers", "spoolss");
+	lp_set_cmdline(global_loadparm, "dcerpc endpoint servers", "spoolss");
 
 	address = iface_n_ip(0);
 	torture_comment(tctx, "Listening for callbacks on %s\n", address);
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 020d49497f..5ef2025d1e 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -131,33 +131,33 @@ static void parse_dns(const char *dns)
 	/* retrievieng the userdn */
 	p = strchr_m(dns, '#');
 	if (!p) {
-		lp_set_cmdline("torture:ldap_userdn", "");
-		lp_set_cmdline("torture:ldap_basedn", "");
-		lp_set_cmdline("torture:ldap_secret", "");
+		lp_set_cmdline(global_loadparm, "torture:ldap_userdn", "");
+		lp_set_cmdline(global_loadparm, "torture:ldap_basedn", "");
+		lp_set_cmdline(global_loadparm, "torture:ldap_secret", "");
 		return;
 	}
 	userdn = strndup(dns, p - dns);
-	lp_set_cmdline("torture:ldap_userdn", userdn);
+	lp_set_cmdline(global_loadparm, "torture:ldap_userdn", userdn);
 
 	/* retrieve the basedn */
 	d = p + 1;
 	p = strchr_m(d, '#');
 	if (!p) {
-		lp_set_cmdline("torture:ldap_basedn", "");
-		lp_set_cmdline("torture:ldap_secret", "");
+		lp_set_cmdline(global_loadparm, "torture:ldap_basedn", "");
+		lp_set_cmdline(global_loadparm, "torture:ldap_secret", "");
 		return;
 	}
 	basedn = strndup(d, p - d);
-	lp_set_cmdline("torture:ldap_basedn", basedn);
+	lp_set_cmdline(global_loadparm, "torture:ldap_basedn", basedn);
 
 	/* retrieve the secret */
 	p = p + 1;
 	if (!p) {
-		lp_set_cmdline("torture:ldap_secret", "");
+		lp_set_cmdline(global_loadparm, "torture:ldap_secret", "");
 		return;
 	}
 	secret = strdup(p);
-	lp_set_cmdline("torture:ldap_secret", secret);
+	lp_set_cmdline(global_loadparm, "torture:ldap_secret", secret);
 
 	printf ("%s - %s - %s\n", userdn, basedn, secret);
 
@@ -448,7 +448,7 @@ void run_shell(struct torture_context *tctx)
 				fprintf(stderr, "Usage: set <variable> <value>\n");
 			} else {
 				char *name = talloc_asprintf(NULL, "torture:%s", argv[1]);
-				lp_set_cmdline(name, argv[2]);
+				lp_set_cmdline(global_loadparm, name, argv[2]);
 				talloc_free(name);
 			}
 		} else if (!strcmp(argv[0], "help")) {
@@ -538,36 +538,36 @@ int main(int argc,char *argv[])
 	while((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_LOADFILE:
-			lp_set_cmdline("torture:loadfile", poptGetOptArg(pc));
+			lp_set_cmdline(global_loadparm, "torture:loadfile", poptGetOptArg(pc));
 			break;
 		case OPT_UNCLIST:
-			lp_set_cmdline("torture:unclist", poptGetOptArg(pc));
+			lp_set_cmdline(global_loadparm, "torture:unclist", poptGetOptArg(pc));
 			break;
 		case OPT_TIMELIMIT:
-			lp_set_cmdline("torture:timelimit", poptGetOptArg(pc));
+			lp_set_cmdline(global_loadparm, "torture:timelimit", poptGetOptArg(pc));
 			break;
 		case OPT_NUMPROGS:
-			lp_set_cmdline("torture:nprocs", poptGetOptArg(pc));
+			lp_set_cmdline(global_loadparm, "torture:nprocs", poptGetOptArg(pc));
 			break;
 		case OPT_DNS:
 			parse_dns(poptGetOptArg(pc));
 			break;
 		case OPT_DANGEROUS:
-			lp_set_cmdline("torture:dangerous", "Yes");
+			lp_set_cmdline(global_loadparm, "torture:dangerous", "Yes");
 			break;
 		case OPT_ASYNC:
-			lp_set_cmdline("torture:async", "Yes");
+			lp_set_cmdline(global_loadparm, "torture:async", "Yes");
 			break;
 		case OPT_SMB_PORTS:
-			lp_set_cmdline("smb ports", poptGetOptArg(pc));
+			lp_set_cmdline(global_loadparm, "smb ports", poptGetOptArg(pc));
 			break;
 		}
 	}
 
 	if (strcmp(target, "samba3") == 0) {
-		lp_set_cmdline("torture:samba3", "true");
+		lp_set_cmdline(global_loadparm, "torture:samba3", "true");
 	} else if (strcmp(target, "samba4") == 0) {
-		lp_set_cmdline("torture:samba4", "true");
+		lp_set_cmdline(global_loadparm, "torture:samba4", "true");
 	}
 
 	if (max_runtime) {
@@ -632,14 +632,14 @@ int main(int argc,char *argv[])
 			usage(pc);
 			return false;
 		}
-		lp_set_cmdline("torture:host", binding_struct->host);
+		lp_set_cmdline(global_loadparm, "torture:host", binding_struct->host);
 		if (lp_parm_string(NULL, "torture", "share") == NULL)
-			lp_set_cmdline("torture:share", "IPC$");
-		lp_set_cmdline("torture:binding", argv_new[1]);
+			lp_set_cmdline(global_loadparm, "torture:share", "IPC$");
+		lp_set_cmdline(global_loadparm, "torture:binding", argv_new[1]);
 	} else {
-		lp_set_cmdline("torture:host", host);
-		lp_set_cmdline("torture:share", share);
-		lp_set_cmdline("torture:binding", host);
+		lp_set_cmdline(global_loadparm, "torture:host", host);
+		lp_set_cmdline(global_loadparm, "torture:share", share);
+		lp_set_cmdline(global_loadparm, "torture:binding", host);
 	}
 
 	if (!strcmp(ui_ops_name, "simple")) {
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index 8b944e33a0..c648273c83 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -643,7 +643,7 @@ double torture_create_procs(struct torture_context *tctx,
 			srandom(((int)mypid) ^ ((int)time(NULL)));
 
 			asprintf(&myname, "CLIENT%d", i);
-			lp_set_cmdline("netbios name", myname);
+			lp_set_cmdline(global_loadparm, "netbios name", myname);
 			free(myname);