r24362: Initialize padding also when no params are sent back

(This used to be commit 03c5e960a21ae78cdd832a5c760015f7fbd83bd9)

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index f65d833ab06e86371a6cea1d354718c498c8845d..9c4c8556d2c1e7f1a5e9aad3315d6ff93d98565f 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -699,13 +699,15 @@ void send_trans2_replies(struct smb_request *req,
                        SSVAL(req->outbuf,smb_drdisp, pd - pdata);
                }
 
+               /* Initialize the padding for alignment */
+
+               if (alignment_offset != 0) {
+                       memset(smb_buf(req->outbuf), 0, alignment_offset);
+               }
+
                /* Copy the param bytes into the packet */
 
                if(params_sent_thistime) {
-                       if (alignment_offset != 0) {
-                               memset(smb_buf(req->outbuf), 0,
-                                      alignment_offset);
-                       }
                        memcpy((smb_buf(req->outbuf)+alignment_offset), pp,
                               params_sent_thistime);
                }