summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-03-20 08:49:20 +0100
committerJeremy Allison <jra@samba.org>2013-03-20 21:53:20 +0100
commit599a699adec1f8f0a432d9c34f378d48930ca29b (patch)
tree4dd82b32ce3e172c451c445dfc8e457c93db0113 /source4
parentc9066b057a6aa3cc1960124c9f2519413a2b57da (diff)
downloadsamba-599a699adec1f8f0a432d9c34f378d48930ca29b.tar.gz
samba-599a699adec1f8f0a432d9c34f378d48930ca29b.tar.bz2
samba-599a699adec1f8f0a432d9c34f378d48930ca29b.zip
s4:torture: let raw.read accept larger reads than 0x10000
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Wed Mar 20 21:53:20 CET 2013 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/raw/read.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 5a5ffeeb4a..59089bff42 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -524,8 +524,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli)
CHECK_STATUS(status, NT_STATUS_OK);
CHECK_VALUE(io.readx.out.remaining, 0xFFFF);
CHECK_VALUE(io.readx.out.compaction_mode, 0);
- if (torture_setting_bool(tctx, "samba3", false) ||
- torture_setting_bool(tctx, "samba4", false)) {
+ if (io.readx.out.nread == io.readx.in.maxcnt) {
printf("SAMBA: large read extension\n");
CHECK_VALUE(io.readx.out.nread, 80000);
} else {
@@ -574,8 +573,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli)
io.readx.in.maxcnt = 0x10001;
status = smb_raw_read(cli->tree, &io);
CHECK_STATUS(status, NT_STATUS_OK);
- if (torture_setting_bool(tctx, "samba3", false) ||
- torture_setting_bool(tctx, "samba4", false)) {
+ if (io.readx.out.nread == io.readx.in.maxcnt) {
printf("SAMBA: large read extension\n");
CHECK_VALUE(io.readx.out.nread, 0x10001);
} else {