Changeset 989 for vendor/current/source3/smbd/aio.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/smbd/aio.c (modified) (2 diffs)

vendor/current/source3/smbd/aio.c

@@ -273 +273 @@
         int outsize;
         char *outbuf = (char *)aio_ex->outbuf.data;
-        char *data = smb_buf(outbuf) + 1 /* padding byte */;
         ssize_t nread;
         int err;
@@ -302 +301 @@
                 outsize = srv_set_message(outbuf,0,0,true);
         } else {
-                outsize = srv_set_message(outbuf, 12,
-                                          nread + 1 /* padding byte */, false);
-                SSVAL(outbuf,smb_vwv2, 0xFFFF); /* Remaining - must be * -1. */
-                SSVAL(outbuf,smb_vwv5, nread);
-                SSVAL(outbuf,smb_vwv6, smb_offset(data,outbuf));
-                SSVAL(outbuf,smb_vwv7, ((nread >> 16) & 1));
-                SSVAL(smb_buf(outbuf), -2, nread);
+                outsize = setup_readX_header(outbuf, nread);
 
                 aio_ex->fsp->fh->pos = aio_ex->offset + nread;