Changeset 480 for trunk/server/source3/smbd/trans2.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/trans2.c (modified) (16 diffs)

trunk/server/source3/smbd/trans2.c

@@ -56 +56 @@
         }
         return val;
+}
+
+/********************************************************************
+ Create a 64 bit FileIndex. If the file is on the same device as
+ the root of the share, just return the 64-bit inode. If it isn't,
+ mangle as we used to do.
+********************************************************************/
+
+uint64_t get_FileIndex(connection_struct *conn, const SMB_STRUCT_STAT *psbuf)
+{
+        uint64_t file_index;
+        if (conn->base_share_dev == psbuf->st_ex_dev) {
+                return (uint64_t)psbuf->st_ex_ino;
+        }
+        file_index = ((psbuf->st_ex_ino) & UINT32_MAX); /* FileIndexLow */
+        file_index |= ((uint64_t)((psbuf->st_ex_dev) & UINT32_MAX)) << 32; /* FileIndexHigh */
+        return file_index;
 }
 
@@ -133 +150 @@
         } else {
 #else
-                {
+                {
 #endif
                 pea->name = talloc_strdup(mem_ctx, ea_name);
@@ -1074 +1091 @@
 
         /* Any data in this call is an EA list. */
-        if (total_data && (total_data != 4) && !lp_ea_support(SNUM(conn))) {
-                reply_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
-                goto out;
-        }
-
-        if (total_data != 4) {
+        if (total_data && (total_data != 4)) {
                 if (total_data < 10) {
                         reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
@@ -1098 +1110 @@
                         goto out;
                 }
-        } else if (IVAL(pdata,0) != 4) {
-                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                goto out;
+
+                if (!lp_ea_support(SNUM(conn))) {
+                        reply_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
+                        goto out;
+                }
         }
 
@@ -1491 +1505 @@
         uint64_t file_size = 0;
         uint64_t allocation_size = 0;
+        uint64_t file_index = 0;
         uint32_t len;
         struct timespec mdate_ts, adate_ts, cdate_ts, create_date_ts;
@@ -1512 +1527 @@
         }
         allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, NULL, &smb_fname->st);
+
+        file_index = get_FileIndex(conn, &smb_fname->st);
 
         mdate_ts = smb_fname->st.st_ex_mtime;
@@ -1881 +1898 @@
                 }
                 SIVAL(p,0,0); p += 4; /* Unknown - reserved ? */
-                SIVAL(p,0,smb_fname->st.st_ex_ino); p += 4; /* FileIndexLow */
-                SIVAL(p,0,smb_fname->st.st_ex_dev); p += 4; /* FileIndexHigh */
+                SBVAL(p,0,file_index); p += 8;
                 len = srvstr_push(base_data, flags2, p,
                                   fname, PTR_DIFF(end_data, p),
@@ -1952 +1968 @@
                 p += 26;
                 SSVAL(p,0,0); p += 2; /* Reserved ? */
-                SIVAL(p,0,smb_fname->st.st_ex_ino); p += 4; /* FileIndexLow */
-                SIVAL(p,0,smb_fname->st.st_ex_dev); p += 4; /* FileIndexHigh */
+                SBVAL(p,0,file_index); p += 8;
                 len = srvstr_push(base_data, flags2, p,
                                   fname, PTR_DIFF(end_data, p),
@@ -3867 +3882 @@
                                 const SMB_STRUCT_STAT *psbuf)
 {
+        uint64_t file_index = get_FileIndex(conn, psbuf);
+
         DEBUG(10,("store_file_unix_basic: SMB_QUERY_FILE_UNIX_BASIC\n"));
         DEBUG(4,("store_file_unix_basic: st_mode=%o\n",(int)psbuf->st_ex_mode));
@@ -3900 +3917 @@
         pdata += 8;
 
-        SINO_T_VAL(pdata,0,(SMB_INO_T)psbuf->st_ex_ino);   /* inode number */
+        SINO_T_VAL(pdata,0,(SMB_INO_T)file_index);   /* inode number */
         pdata += 8;
 
@@ -4302 +4319 @@
            I think this causes us to fail the IFSKIT
            BasicFileInformationTest. -tpot */
-        file_index =  ((psbuf->st_ex_ino) & UINT32_MAX); /* FileIndexLow */
-        file_index |= ((uint64_t)((psbuf->st_ex_dev) & UINT32_MAX)) << 32; /* FileIndexHigh */
+        file_index = get_FileIndex(conn, psbuf);
 
         switch (info_level) {
@@ -5473 +5489 @@
         else {
 #endif
-
         DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
@@ -5957 +5972 @@
                                        req->flags2 & FLAGS2_DFS_PATHNAMES,
                                        newname,
+                                       true,
                                        &newname,
                                        &dest_has_wcard);
@@ -7829 +7845 @@
         }
 
-        /* Any data in this call is an EA list. */
-        if (total_data && (total_data != 4) && !lp_ea_support(SNUM(conn))) {
-                reply_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
-                goto out;
-        }
-
         /*
          * OS/2 workplace shell seems to send SET_EA requests of "null"
@@ -7841 +7851 @@
          */
 
-        if (total_data != 4) {
+        if (total_data && (total_data != 4)) {
+                /* Any data in this call is an EA list. */
                 if (total_data < 10) {
                         reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
@@ -7858 +7869 @@
                 if (!ea_list) {
                         reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                        goto out;
+                }
+
+                if (!lp_ea_support(SNUM(conn))) {
+                        reply_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
                         goto out;
                 }