Changeset 989 for vendor/current/source3/smbd/reply.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/reply.c (modified) (6 diffs)

vendor/current/source3/smbd/reply.c

@@ -1574 +1574 @@
         uint64_t ret;
         uint64_t dfree,dsize,bsize;
+        struct smb_filename smb_fname;
         START_PROFILE(SMBdskattr);
 
-        ret = get_dfree_info(conn, ".", &bsize, &dfree, &dsize);
+        ZERO_STRUCT(smb_fname);
+        smb_fname.base_name = discard_const_p(char, ".");
+
+        if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
+                reply_nterror(req, map_nt_error_from_unix(errno));
+                DBG_WARNING("stat of . failed (%s)\n", strerror(errno));
+                END_PROFILE(SMBdskattr);
+                return;
+        }
+
+        ret = get_dfree_info(conn, &smb_fname, &bsize, &dfree, &dsize);
         if (ret == (uint64_t)-1) {
                 reply_nterror(req, map_nt_error_from_unix(errno));
@@ -3897 +3908 @@
 ****************************************************************************/
 
-static int setup_readX_header(struct smb_request *req, char *outbuf,
-                              size_t smb_maxcnt)
+int setup_readX_header(char *outbuf, size_t smb_maxcnt)
 {
         int outsize;
@@ -3917 +3927 @@
               + 1);             /* padding byte */
         SSVAL(outbuf,smb_vwv7,(smb_maxcnt >> 16));
-        SSVAL(outbuf,smb_vwv11,smb_maxcnt);
         SCVAL(smb_buf(outbuf), 0, 0); /* padding byte */
         /* Reset the outgoing length, set_message truncates at 0x1FFFF. */
@@ -3985 +3994 @@
 
                 construct_reply_common_req(req, (char *)headerbuf);
-                setup_readX_header(req, (char *)headerbuf, smb_maxcnt);
+                setup_readX_header((char *)headerbuf, smb_maxcnt);
 
                 nread = SMB_VFS_SENDFILE(xconn->transport.sock, fsp, &header,
@@ -4086 +4095 @@
 
                 construct_reply_common_req(req, (char *)headerbuf);
-                setup_readX_header(req, (char *)headerbuf, smb_maxcnt);
+                setup_readX_header((char *)headerbuf, smb_maxcnt);
 
                 /* Send out the header. */
@@ -4136 +4145 @@
         }
 
-        setup_readX_header(req, (char *)req->outbuf, nread);
+        setup_readX_header((char *)req->outbuf, nread);
 
         DEBUG(3, ("send_file_readX %s max=%d nread=%d\n",