diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 21:32:08 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:13 +0100 |
| commit | 934e932387ea5668ec000bcefe4ec86935297339 (patch) | |
| tree | b101a7e8ff027df768ef9612ca9a7b84f12a7b8a /source4/torture/smb2 | |
| parent | 7e298580e06a5b9a0c1210937af47f277849080e (diff) | |
| download | samba-934e932387ea5668ec000bcefe4ec86935297339.tar.gz samba-934e932387ea5668ec000bcefe4ec86935297339.tar.bz2 samba-934e932387ea5668ec000bcefe4ec86935297339.zip | |
r26235: Avoid global_loadparm.
(This used to be commit e9039782204389cc827e76da319d5ccf6d33be46)
Diffstat (limited to 'source4/torture/smb2')
| -rw-r--r-- | source4/torture/smb2/connect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index 796b180ddf..d01c138ef8 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -65,7 +65,7 @@ static NTSTATUS torture_smb2_close(struct smb2_tree *tree, struct smb2_handle ha /* test writing */ -static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle handle) +static NTSTATUS torture_smb2_write(struct torture_context *tctx, struct smb2_tree *tree, struct smb2_handle handle) { struct smb2_write w; struct smb2_read r; @@ -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(global_loadparm, NULL, "torture", "dangerous", false)) { + if (torture_setting_bool(tctx, "dangerous", false)) { data = data_blob_talloc(tree, NULL, 160000); - } else if (lp_parm_bool(global_loadparm, NULL, "torture", "samba4", false)) { + } else if (torture_setting_bool(tctx, "samba4", false)) { data = data_blob_talloc(tree, NULL, UINT16_MAX); } else { data = data_blob_talloc(tree, NULL, 120000); @@ -202,7 +202,7 @@ bool torture_smb2_connect(struct torture_context *torture) h1 = torture_smb2_create(tree, "test9.dat"); h2 = torture_smb2_create(tree, "test9.dat"); - status = torture_smb2_write(tree, h1); + status = torture_smb2_write(torture, tree, h1); if (!NT_STATUS_IS_OK(status)) { printf("Write failed - %s\n", nt_errstr(status)); return false; |