summaryrefslogtreecommitdiff
path: root/source4/libcli/raw
diff options
context:
space:
mode:
authorChristof Schmitt <cs@samba.org>2014-08-07 14:19:57 -0700
committerJeremy Allison <jra@samba.org>2014-08-30 00:27:13 +0200
commitaea680b7dbc648712bd0216baa6f125521502d71 (patch)
tree5a616c25373289329038110c8225bbe60bfb9913 /source4/libcli/raw
parent2132acb4d99d01834f1ed8900f1db45bb1253922 (diff)
downloadsamba-aea680b7dbc648712bd0216baa6f125521502d71.tar.gz
s4:libcli/raw: Make flags2 and offset available to callers of readx
This will be used by smbtorture. Signed-off-by: Christof Schmitt <cs@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source4/libcli/raw')
-rw-r--r--source4/libcli/raw/interfaces.h2
-rw-r--r--source4/libcli/raw/rawreadwrite.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 12c03774f55..9003c123a25 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -1809,6 +1809,8 @@ union smb_read {
uint16_t remaining;
uint16_t compaction_mode;
uint32_t nread;
+ uint16_t flags2;
+ uint16_t data_offset;
} out;
} readx, generic;
diff --git a/source4/libcli/raw/rawreadwrite.c b/source4/libcli/raw/rawreadwrite.c
index d3f5518e01a..fb44ba41b8e 100644
--- a/source4/libcli/raw/rawreadwrite.c
+++ b/source4/libcli/raw/rawreadwrite.c
@@ -155,6 +155,8 @@ _PUBLIC_ NTSTATUS smb_raw_read_recv(struct smbcli_request *req, union smb_read *
parms->readx.out.remaining = SVAL(req->in.vwv, VWV(2));
parms->readx.out.compaction_mode = SVAL(req->in.vwv, VWV(3));
parms->readx.out.nread = SVAL(req->in.vwv, VWV(5));
+ parms->readx.out.flags2 = req->flags2;
+ parms->readx.out.data_offset = SVAL(req->in.vwv, VWV(6));
/* handle oversize replies for non-chained readx replies with
CAP_LARGE_READX. The snia spec has must to answer for. */