diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-04-14 11:31:17 +0200 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-04-14 11:31:17 +0200 |
commit | 275f32ae2df333c089343dd20fc4efee1bed2b7b (patch) | |
tree | b5e3423e779263bd4fb498965d30ddeaad910d1d /source4/smb_server/smb2 | |
parent | 6abdaefb0f726d1b45b7eb698a88bfe8e354743a (diff) | |
download | samba-275f32ae2df333c089343dd20fc4efee1bed2b7b.tar.gz samba-275f32ae2df333c089343dd20fc4efee1bed2b7b.tar.bz2 samba-275f32ae2df333c089343dd20fc4efee1bed2b7b.zip |
fill in unknown fields in SMB2 READ call
(This used to be commit 9b686c138037f613da15168d0722786e00f023e5)
Diffstat (limited to 'source4/smb_server/smb2')
-rw-r--r-- | source4/smb_server/smb2/fileio.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c index 0e3df56b42..8f8b4e771c 100644 --- a/source4/smb_server/smb2/fileio.c +++ b/source4/smb_server/smb2/fileio.c @@ -167,7 +167,8 @@ static void smb2srv_read_send(struct ntvfs_request *ntvfs) /* TODO: avoid the memcpy */ SMB2SRV_CHECK(smb2_push_o16s32_blob(&req->out, 0x02, io->smb2.out.data)); - SBVAL(req->out.body, 0x08, io->smb2.out.unknown1); + SIVAL(req->out.body, 0x08, io->smb2.out.remaining); + SIVAL(req->out.body, 0x0C, io->smb2.out.reserved); smb2srv_send_reply(req); } @@ -185,8 +186,11 @@ void smb2srv_read_recv(struct smb2srv_request *req) io->smb2.in.length = IVAL(req->in.body, 0x04); io->smb2.in.offset = BVAL(req->in.body, 0x08); io->smb2.in.file.ntvfs = smb2srv_pull_handle(req, req->in.body, 0x10); - io->smb2.in.unknown1 = BVAL(req->in.body, 0x20); - io->smb2.in.unknown2 = BVAL(req->in.body, 0x28); + io->smb2.in.min_count = IVAL(req->in.body, 0x20); + io->smb2.in.channel = IVAL(req->in.body, 0x24); + io->smb2.in.remaining = IVAL(req->in.body, 0x28); + io->smb2.in.channel_offset = SVAL(req->in.body, 0x2C); + io->smb2.in.channel_length = SVAL(req->in.body, 0x2E); SMB2SRV_CHECK_FILE_HANDLE(io->smb2.in.file.ntvfs); |