diff options
author | Jeremy Allison <jra@samba.org> | 2005-07-14 08:51:48 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:05 -0500 |
commit | 0d8ef1cec4134521dc507bd27f256ed93084818c (patch) | |
tree | f63b5d92dce4847291cb11d071e11c8d3f1d6ea6 | |
parent | 200ff9c1e930249a0ab1dea4a8b1b92ef614aa6e (diff) | |
download | samba-0d8ef1cec4134521dc507bd27f256ed93084818c.tar.gz samba-0d8ef1cec4134521dc507bd27f256ed93084818c.tar.bz2 samba-0d8ef1cec4134521dc507bd27f256ed93084818c.zip |
r8457: Fix from Marcel Müller <mueller@maazl.de> to ensure
we correctly set the return packet size to include
the pad bytes in reply_readbmpx().
Jeremy.
(This used to be commit 3070ec288c64880485ed159d512e91346f5d1b4e)
-rw-r--r-- | source3/smbd/reply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 5e8c0ef296..4ce93222f7 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -5308,7 +5308,7 @@ int reply_readbmpx(connection_struct *conn, char *inbuf,char *outbuf,int length, if (nread < (ssize_t)N) tcount = total_read + nread; - set_message(outbuf,8,nread,False); + set_message(outbuf,8,nread+pad,False); SIVAL(outbuf,smb_vwv0,startpos); SSVAL(outbuf,smb_vwv2,tcount); SSVAL(outbuf,smb_vwv6,nread); |