diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 13:49:47 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 13:49:47 +0200 |
| commit | a96bba21fa99d7057f001bfc159930052d83d974 (patch) | |
| tree | 3d00eba12b29f6ff939110bccf26021c78334fee /source4/smb_server | |
| parent | ca78fa8cae96099055a6ae7a0963c2b2789f2b87 (diff) | |
| parent | 7cf29ac84e2f45dfc56d5e46678a96527a38a1c1 (diff) | |
| download | samba-a96bba21fa99d7057f001bfc159930052d83d974.tar.gz samba-a96bba21fa99d7057f001bfc159930052d83d974.tar.bz2 samba-a96bba21fa99d7057f001bfc159930052d83d974.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 92751a73cd854365d365db854179bfd5aeabe7a2)
Diffstat (limited to 'source4/smb_server')
| -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); |