From c9066b057a6aa3cc1960124c9f2519413a2b57da Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Mar 2013 17:11:03 +0100 Subject: s4:torture: raw.read fix large reads against windows Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- source4/torture/raw/read.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index 6586177e3e..5a5ffeeb4a 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -529,7 +529,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli) printf("SAMBA: large read extension\n"); CHECK_VALUE(io.readx.out.nread, 80000); } else { - CHECK_VALUE(io.readx.out.nread, 0); + CHECK_VALUE(io.readx.out.nread, 0x10000); } CHECK_BUFFER(buf, seed, io.readx.out.nread); @@ -569,13 +569,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli) io.readx.in.maxcnt = 0x10000; 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)) { - printf("SAMBA: large read extension\n"); - CHECK_VALUE(io.readx.out.nread, 0x10000); - } else { - CHECK_VALUE(io.readx.out.nread, 0); - } + CHECK_VALUE(io.readx.out.nread, 0x10000); io.readx.in.maxcnt = 0x10001; status = smb_raw_read(cli->tree, &io); @@ -585,7 +579,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli) printf("SAMBA: large read extension\n"); CHECK_VALUE(io.readx.out.nread, 0x10001); } else { - CHECK_VALUE(io.readx.out.nread, 0); + CHECK_VALUE(io.readx.out.nread, 0x10000); } } else { printf("Server does not support the CAP_LARGE_READX extension\n"); -- cgit