diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-29 18:00:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:31 -0500 |
| commit | 60a1046c5c5783799bd64fe18e03534670f83d82 (patch) | |
| tree | 48f788a6a6fbed5af0a3f3eea1e4373d70b03e5b /source4/torture/raw/unlink.c | |
| parent | 98038f71a7b072912c974d131012335ca22c5259 (diff) | |
| download | samba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.gz samba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.bz2 samba-60a1046c5c5783799bd64fe18e03534670f83d82.zip | |
r25430: Add the loadparm context to all parametric options.
(This used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58)
Diffstat (limited to 'source4/torture/raw/unlink.c')
| -rw-r--r-- | source4/torture/raw/unlink.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index 88f9a71aaf..287a8b3458 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -129,7 +129,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli) io.unlink.in.attrib = FILE_ATTRIBUTE_DIRECTORY; status = smb_raw_unlink(cli->tree, &io); - if (lp_parm_bool(NULL, "torture", "samba3", false)) { + if (lp_parm_bool(global_loadparm, NULL, "torture", "samba3", false)) { /* * In Samba3 we gave up upon getting the error codes in * wildcard unlink correct. Trying gentest showed that this is @@ -157,7 +157,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli) io.unlink.in.pattern = BASEDIR "\\t*"; io.unlink.in.attrib = FILE_ATTRIBUTE_DIRECTORY; status = smb_raw_unlink(cli->tree, &io); - if (lp_parm_bool(NULL, "torture", "samba3", false)) { + if (lp_parm_bool(global_loadparm, NULL, "torture", "samba3", false)) { CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_INVALID); } else { @@ -169,7 +169,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli) io.unlink.in.pattern = BASEDIR "\\*.dat"; io.unlink.in.attrib = FILE_ATTRIBUTE_DIRECTORY; status = smb_raw_unlink(cli->tree, &io); - if (lp_parm_bool(NULL, "torture", "samba3", false)) { + if (lp_parm_bool(global_loadparm, NULL, "torture", "samba3", false)) { CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_INVALID); } else { @@ -179,7 +179,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli) io.unlink.in.pattern = BASEDIR "\\*.tx?"; io.unlink.in.attrib = 0; status = smb_raw_unlink(cli->tree, &io); - if (lp_parm_bool(NULL, "torture", "samba3", false)) { + if (lp_parm_bool(global_loadparm, NULL, "torture", "samba3", false)) { CHECK_STATUS(status, NT_STATUS_NO_SUCH_FILE); } else { @@ -282,7 +282,7 @@ static bool test_delete_on_close(struct torture_context *tctx, CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); - if (!lp_parm_bool(NULL, "torture", "samba3", false)) { + if (!lp_parm_bool(global_loadparm, NULL, "torture", "samba3", false)) { /* * Known deficiency, also skipped in base-delete. |