From 599a699adec1f8f0a432d9c34f378d48930ca29b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 20 Mar 2013 08:49:20 +0100 Subject: [PATCH] s4:torture: let raw.read accept larger reads than 0x10000 Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Mar 20 21:53:20 CET 2013 on sn-devel-104 --- source4/torture/raw/read.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index 5a5ffeeb4a1..59089bff429 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 { -- 2.11.4.GIT