diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-03-19 17:11:03 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-03-20 10:07:42 -0700 |
| commit | c9066b057a6aa3cc1960124c9f2519413a2b57da (patch) | |
| tree | dbe02ec16289cfa5bc3aa5b33bcc69bc5abb432b | |
| parent | df618e33ac011c018374af8da021c7b5f1cc1427 (diff) | |
| download | samba-c9066b057a6aa3cc1960124c9f2519413a2b57da.tar.gz samba-c9066b057a6aa3cc1960124c9f2519413a2b57da.tar.bz2 samba-c9066b057a6aa3cc1960124c9f2519413a2b57da.zip | |
s4:torture: raw.read fix large reads against windows
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source4/torture/raw/read.c | 12 |
1 files 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"); |