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

vendor/current/source3/smbd/dosmode.c

@@ -258 +258 @@
 ****************************************************************************/
 
-static bool get_ea_dos_attribute(connection_struct *conn,
-                                 struct smb_filename *smb_fname,
-                                 uint32_t *pattr)
+bool get_ea_dos_attribute(connection_struct *conn,
+                          struct smb_filename *smb_fname,
+                          uint32_t *pattr)
 {
         struct xattr_DOSATTRIB dosattrib;
@@ -553 +553 @@
 }
 
+static uint32_t dos_mode_from_name(connection_struct *conn,
+                                   const struct smb_filename *smb_fname,
+                                   uint32_t dosmode)
+{
+        const char *p = NULL;
+        uint32_t result = dosmode;
+
+        if (!(result & FILE_ATTRIBUTE_HIDDEN) &&
+            lp_hide_dot_files(SNUM(conn)))
+        {
+                p = strrchr_m(smb_fname->base_name, '/');
+                if (p) {
+                        p++;
+                } else {
+                        p = smb_fname->base_name;
+                }
+
+                /* Only . and .. are not hidden. */
+                if ((p[0] == '.') &&
+                    !((p[1] == '\0') || (p[1] == '.' && p[2] == '\0')))
+                {
+                        result |= FILE_ATTRIBUTE_HIDDEN;
+                }
+        }
+
+        if (!(result & FILE_ATTRIBUTE_HIDDEN) &&
+            IS_HIDDEN_PATH(conn, smb_fname->base_name))
+        {
+                result |= FILE_ATTRIBUTE_HIDDEN;
+        }
+
+        return result;
+}
+
 /****************************************************************************
  Change a unix mode to a dos mode.
@@ -568 +602 @@
         if (!VALID_STAT(smb_fname->st)) {
                 return 0;
-        }
-
-        /* First do any modifications that depend on the path name. */
-        /* hide files with a name starting with a . */
-        if (lp_hide_dot_files(SNUM(conn))) {
-                const char *p = strrchr_m(smb_fname->base_name,'/');
-                if (p) {
-                        p++;
-                } else {
-                        p = smb_fname->base_name;
-                }
-
-                /* Only . and .. are not hidden. */
-                if (p[0] == '.' && !((p[1] == '\0') ||
-                                (p[1] == '.' && p[2] == '\0'))) {
-                        result |= FILE_ATTRIBUTE_HIDDEN;
-                }
         }
 
@@ -606 +623 @@
         }
 
-        /* Optimization : Only call is_hidden_path if it's not already
-           hidden. */
-        if (!(result & FILE_ATTRIBUTE_HIDDEN) &&
-            IS_HIDDEN_PATH(conn, smb_fname->base_name)) {
-                result |= FILE_ATTRIBUTE_HIDDEN;
-        }
+        result |= dos_mode_from_name(conn, smb_fname, result);
 
         if (result == 0) {
-                result = FILE_ATTRIBUTE_NORMAL;
+                if (S_ISDIR(smb_fname->st.st_ex_mode)) {
+                        result = FILE_ATTRIBUTE_DIRECTORY;
+                } else {
+                        result = FILE_ATTRIBUTE_NORMAL;
+                }
         }