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)

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5e8c0ef296dacab743fa6037d41c4dff853fdc0e..4ce93222f701cc817c63c85af77aaf1ad299cd56 100644 (file)
--- 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);