summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-11-20 11:25:43 -0800
committerTim Prouty <tprouty@samba.org>2009-12-03 18:54:52 -0800
commitfc7832602d149dee61ff003902bc5f54cd0de0f2 (patch)
tree949bd5144c0e0d37d4994ed0d1bb5187a7f29c86
parentaf8b7857ca4b9f81d2240d2592c4d02893b04f76 (diff)
downloadsamba-fc7832602d149dee61ff003902bc5f54cd0de0f2.tar.gz
samba-fc7832602d149dee61ff003902bc5f54cd0de0f2.tar.bz2
samba-fc7832602d149dee61ff003902bc5f54cd0de0f2.zip
s4 torture: Convert to a more modern version of read in RAW-OPLOCK-BATCH4
-rw-r--r--source4/torture/raw/oplock.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 106acfe793..85362d126f 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -973,11 +973,13 @@ static bool test_raw_oplock_batch4(struct torture_context *tctx, struct smbcli_s
fnum = io.ntcreatex.out.file.fnum;
CHECK_VAL(io.ntcreatex.out.oplock_level, BATCH_OPLOCK_RETURN);
- rd.read.level = RAW_READ_READ;
- rd.read.in.file.fnum = fnum;
- rd.read.in.count = 1;
- rd.read.in.offset = 0;
- rd.read.in.remaining = 0;
+ rd.readx.level = RAW_READ_READX;
+ rd.readx.in.file.fnum = fnum;
+ rd.readx.in.mincnt = 1;
+ rd.readx.in.maxcnt = 1;
+ rd.readx.in.offset = 0;
+ rd.readx.in.remaining = 0;
+ rd.readx.in.read_for_execute = false;
status = smb_raw_read(cli1->tree, &rd);
CHECK_STATUS(tctx, status, NT_STATUS_OK);
torture_wait_for_oplock_break(tctx);