s3: Simplify smb_splice_chain
authorVolker Lendecke <vl@samba.org>
Fri, 24 Feb 2012 15:16:23 +0000 (16:16 +0100)
committerVolker Lendecke <vl@samba.org>
Fri, 24 Feb 2012 15:34:40 +0000 (16:34 +0100)
With the last commit, bytes_padding is not set anymore

source3/smbd/process.c

index 3cfb0812d6314b8500f2bd95e7713dfa5ad27b9c..72cc3137fbfc3181491cfd47df617df109e56d03 100644 (file)
@@ -1790,7 +1790,6 @@ static bool smb_splice_chain(uint8_t **poutbuf, const uint8_t *andx_buf)
        size_t old_size, new_size;
        size_t ofs;
        size_t chain_padding = 0;
-       size_t bytes_padding = 0;
        bool first_request;
 
        old_size = talloc_get_size(*poutbuf);
@@ -1816,8 +1815,7 @@ static bool smb_splice_chain(uint8_t **poutbuf, const uint8_t *andx_buf)
         */
 
        new_size = old_size + chain_padding + 1 + wct * sizeof(uint16_t) + 2;
-
-       new_size += bytes_padding + num_bytes;
+       new_size += num_bytes;
 
        if ((smb_command != SMBwriteX) && (new_size > 0xffff)) {
                DEBUG(1, ("smb_splice_chain: %u bytes won't fit\n",
@@ -1875,18 +1873,9 @@ static bool smb_splice_chain(uint8_t **poutbuf, const uint8_t *andx_buf)
         * bcc (byte count)
         */
 
-       SSVAL(outbuf, ofs, num_bytes + bytes_padding);
+       SSVAL(outbuf, ofs, num_bytes);
        ofs += sizeof(uint16_t);
 
-       /*
-        * padding
-        */
-
-       if (bytes_padding != 0) {
-               memset(outbuf + ofs, 0, bytes_padding);
-               ofs += bytes_padding;
-       }
-
        /*
         * The bytes field
         */