diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-26 05:32:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:43 -0500 |
| commit | ea43c2a3ed82fe3cc0643b10054a9ea596167398 (patch) | |
| tree | 324b2f5067ca4f201589900f7b7f6c40993f91ff | |
| parent | d5fd12648e004b47bbe5ed2623838866fedcbeb0 (diff) | |
| download | samba-ea43c2a3ed82fe3cc0643b10054a9ea596167398.tar.gz samba-ea43c2a3ed82fe3cc0643b10054a9ea596167398.tar.bz2 samba-ea43c2a3ed82fe3cc0643b10054a9ea596167398.zip | |
r3234: in SMBreadx, if the client asks for exactly 65535 bytes then don't try
to align the buffer, as that would make the read reply not fit
(This used to be commit 70be45de05993d386ceaf54325d1c3023008eaed)
| -rw-r--r-- | source4/smb_server/reply.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 05919921ca..99291d0134 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -850,7 +850,13 @@ static void reply_read_and_X_send(struct smbsrv_request *req) /* readx reply packets can be over-sized */ req->control_flags |= REQ_CONTROL_LARGE; - req_grow_data(req, 1 + io->readx.out.nread); + if (io->readx.in.maxcnt != 0xFFFF && + io->readx.in.mincnt != 0xFFFF) { + req_grow_data(req, 1 + io->readx.out.nread); + SCVAL(req->out.data, 0, 0); /* padding */ + } else { + req_grow_data(req, io->readx.out.nread); + } /* construct reply */ SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); @@ -860,7 +866,6 @@ static void reply_read_and_X_send(struct smbsrv_request *req) REQ_VWV_RESERVED(4, 1); SSVAL(req->out.vwv, VWV(5), io->readx.out.nread); SSVAL(req->out.vwv, VWV(6), PTR_DIFF(io->readx.out.data, req->out.hdr)); - SCVAL(req->out.data, 0, 0); /* padding */ REQ_VWV_RESERVED(7, 5); chain_reply(req); @@ -897,7 +902,12 @@ void reply_read_and_X(struct smbsrv_request *req) req_setup_reply(req, 12, 1 + io->readx.in.maxcnt); /* tell the backend where to put the data. Notice the pad byte. */ - io->readx.out.data = req->out.data + 1; + if (io->readx.in.maxcnt != 0xFFFF && + io->readx.in.mincnt != 0xFFFF) { + io->readx.out.data = req->out.data + 1; + } else { + io->readx.out.data = req->out.data; + } req->control_flags |= REQ_CONTROL_MAY_ASYNC; req->async.send_fn = reply_read_and_X_send; |