summaryrefslogtreecommitdiff
path: root/source4/torture/util_smb.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-29 18:00:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:31 -0500
commit60a1046c5c5783799bd64fe18e03534670f83d82 (patch)
tree48f788a6a6fbed5af0a3f3eea1e4373d70b03e5b /source4/torture/util_smb.c
parent98038f71a7b072912c974d131012335ca22c5259 (diff)
downloadsamba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.gz
r25430: Add the loadparm context to all parametric options.
(This used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58)
Diffstat (limited to 'source4/torture/util_smb.c')
-rw-r--r--source4/torture/util_smb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index 12d6f826432..10d48313263 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -479,9 +479,9 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
return False;
}
- (*c)->transport->options.use_oplocks = lp_parm_bool(NULL, "torture",
+ (*c)->transport->options.use_oplocks = lp_parm_bool(global_loadparm, NULL, "torture",
"use_oplocks", false);
- (*c)->transport->options.use_level2_oplocks = lp_parm_bool(NULL, "torture",
+ (*c)->transport->options.use_level2_oplocks = lp_parm_bool(global_loadparm, NULL, "torture",
"use_level2_oplocks", false);
return True;
@@ -495,10 +495,10 @@ _PUBLIC_ bool torture_get_conn_index(int conn_index,
int num_unc_names = 0;
const char *p;
- (*host) = talloc_strdup(mem_ctx, lp_parm_string(NULL, "torture", "host"));
- (*share) = talloc_strdup(mem_ctx, lp_parm_string(NULL, "torture", "share"));
+ (*host) = talloc_strdup(mem_ctx, lp_parm_string(global_loadparm, NULL, "torture", "host"));
+ (*share) = talloc_strdup(mem_ctx, lp_parm_string(global_loadparm, NULL, "torture", "share"));
- p = lp_parm_string(NULL, "torture", "unclist");
+ p = lp_parm_string(global_loadparm, NULL, "torture", "unclist");
if (!p) {
return True;
}