diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-18 14:23:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:24 -0500 |
| commit | a39f239cb28e4ac6be207d4179bacffce97f1b3e (patch) | |
| tree | b9f7e4e7e4c6ad7a5d0107b99c75ee2e9ac2132f /source4/torture/smb2 | |
| parent | 19af876bbb7038f5a40cd87eced81661a2fc2ee6 (diff) | |
| download | samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.tar.gz samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.tar.bz2 samba-a39f239cb28e4ac6be207d4179bacffce97f1b3e.zip | |
r19392: Use torture_setting_* rather than lp_parm_* where possible.
(This used to be commit b28860978fe29c5b10abfb8c59d7182864e21dd6)
Diffstat (limited to 'source4/torture/smb2')
| -rw-r--r-- | source4/torture/smb2/connect.c | 2 | ||||
| -rw-r--r-- | source4/torture/smb2/getinfo.c | 2 | ||||
| -rw-r--r-- | source4/torture/smb2/scan.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index 9f36e4d707..46aabc0e9a 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -76,7 +76,7 @@ static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle ha if (lp_parm_bool(-1, "torture", "dangerous", False)) { data = data_blob_talloc(tree, NULL, 160000); - } else if (lp_parm_bool(-1, "target", "samba4", False)) { + } else if (lp_parm_bool(-1, "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 dfabb08225..e90fd8c1c5 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -104,7 +104,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(-1, "target", "samba4", False)) { + if (lp_parm_bool(-1, "torture", "samba4", False)) { continue; } file_levels[i].finfo.all_eas.in.continue_flags = diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 6191499cac..75f62ffa74 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -202,8 +202,8 @@ BOOL torture_smb2_scan(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; - const char *host = lp_parm_string(-1, "torture", "host"); - const char *share = lp_parm_string(-1, "torture", "share"); + const char *host = torture_setting_string(torture, "host", NULL); + const char *share = torture_setting_string(torture, "share", NULL); struct cli_credentials *credentials = cmdline_credentials; NTSTATUS status; int opcode; |