Changeset 862 for trunk/server/source3/smbd/posix_acls.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/posix_acls.c (modified) (2 diffs)

trunk/server/source3/smbd/posix_acls.c

@@ -1373 +1373 @@
                 if (pace->type == SMB_ACL_USER_OBJ) {
 
-                        if (setting_acl && !is_default_acl) {
+                        if (setting_acl) {
+                                /*
+                                 * Ensure we have default parameters for the
+                                 * user (owner) even on default ACLs.
+                                 */
                                 apply_default_perms(params, is_directory, pace, S_IRUSR);
                         }
@@ -1453 +1457 @@
                         }
 
-                        if (!is_default_acl) {
-                                apply_default_perms(params, is_directory, pace, S_IRUSR);
-                        }
+                        /*
+                         * Ensure we have default parameters for the
+                         * user (owner) even on default ACLs.
+                         */
+                        apply_default_perms(params, is_directory, pace, S_IRUSR);
                 } else {
                         pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRUSR, S_IWUSR, S_IXUSR);