diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 15:53:17 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:28 +0100 |
| commit | ab69eb8d8901d23794c6a298718e67656ef4820e (patch) | |
| tree | cd415ecd2aee4caa9e47f6c442d0d23b2f443b9c /source4/torture/smb2/getinfo.c | |
| parent | 0a2f1a46a02d2c9497d05d7e534829dc6e9430dc (diff) | |
| download | samba-ab69eb8d8901d23794c6a298718e67656ef4820e.tar.gz samba-ab69eb8d8901d23794c6a298718e67656ef4820e.tar.xz samba-ab69eb8d8901d23794c6a298718e67656ef4820e.zip | |
r26250: Avoid global_loadparm in a couple more places.
(This used to be commit 2c6b755309fdf685cd0b0564272bf83038574a43)
Diffstat (limited to 'source4/torture/smb2/getinfo.c')
| -rw-r--r-- | source4/torture/smb2/getinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index 73107a52174..f561b62d47b 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -77,7 +77,7 @@ static struct { /* test fileinfo levels */ -static bool torture_smb2_fileinfo(struct smb2_tree *tree) +static bool torture_smb2_fileinfo(struct torture_context *tctx, struct smb2_tree *tree) { struct smb2_handle hfile, hdir; NTSTATUS status; @@ -105,7 +105,7 @@ static bool torture_smb2_fileinfo(struct smb2_tree *tree) file_levels[i].dinfo.query_secdesc.in.secinfo_flags = 0x7; } if (file_levels[i].level == RAW_FILEINFO_SMB2_ALL_EAS) { - if (lp_parm_bool(global_loadparm, NULL, "torture", "samba4", false)) { + if (torture_setting_bool(tctx, "samba4", false)) { continue; } file_levels[i].finfo.all_eas.in.continue_flags = @@ -192,7 +192,7 @@ bool torture_smb2_getinfo(struct torture_context *torture) } torture_setup_complex_file(tree, DNAME ":streamtwo"); - ret &= torture_smb2_fileinfo(tree); + ret &= torture_smb2_fileinfo(torture, tree); ret &= torture_smb2_fsinfo(tree); talloc_free(mem_ctx); |