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>

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 12c03774f55f6fb9b7c120cda8d75417b59d8353..9003c123a25400bf1710e2fcd5ab8c84901d205e 100644 (file)
--- 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 d3f5518e01a36efb7021a4897575efb969214539..fb44ba41b8eec136043a93773d2842180f6a401f 100644 (file)
--- 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. */