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/smb2 | |
| 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/smb2')
| -rw-r--r-- | source4/torture/smb2/connect.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/getinfo.c | 2 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index c9a5732d2a..c071327419 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -74,9 +74,9 @@ static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle ha DATA_BLOB data; int i; - if (lp_parm_bool(NULL, "torture", "dangerous", false)) { + if (lp_parm_bool(global_loadparm, NULL, "torture", "dangerous", false)) { data = data_blob_talloc(tree, NULL, 160000); - } else if (lp_parm_bool(NULL, "torture", "samba4", false)) { + } else if (lp_parm_bool(global_loadparm, NULL, "torture", "samba4", false)) { data = data_blob_talloc(tree, NULL, UINT16_MAX); } else { data = data_blob_talloc(tree, NULL, 120000); diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index 86ca56ba55..ab7d4e3110 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -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(NULL, "torture", "samba4", false)) { + if (lp_parm_bool(global_loadparm, NULL, "torture", "samba4", false)) { continue; } file_levels[i].finfo.all_eas.in.continue_flags = diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 946368a2ed..1852d9a984 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -305,8 +305,8 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle) BOOL torture_smb2_connection(TALLOC_CTX *mem_ctx, struct smb2_tree **tree) { NTSTATUS status; - const char *host = lp_parm_string(NULL, "torture", "host"); - const char *share = lp_parm_string(NULL, "torture", "share"); + const char *host = lp_parm_string(global_loadparm, NULL, "torture", "host"); + const char *share = lp_parm_string(global_loadparm, NULL, "torture", "share"); struct cli_credentials *credentials = cmdline_credentials; status = smb2_connect(mem_ctx, host, share, credentials, tree, |