diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/sec_acl.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3a280edb5..987b4c008 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2015-11-18 Corinna Vinschen <corinna@vinschen.de> + * sec_acl.cc (get_posix_access): Fix class_perm in !new_style case. + +2015-11-18 Corinna Vinschen <corinna@vinschen.de> + Reapply POSIX ACL changes. * sec_acl.cc (get_posix_access): Check for Cygwin "standard" ACL. diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc index 7d97fca02..e52cdb711 100644 --- a/winsup/cygwin/sec_acl.cc +++ b/winsup/cygwin/sec_acl.cc @@ -880,7 +880,8 @@ get_posix_access (PSECURITY_DESCRIPTOR psd, { lacl[pos].a_type = CLASS_OBJ; lacl[pos].a_id = ILLEGAL_GID; - lacl[pos].a_perm = class_perm | lacl[1].a_perm; + class_perm |= lacl[1].a_perm; + lacl[pos].a_perm = class_perm; } /* For ptys, fake a mask if the admins group is neither owner nor group. In that case we have an extra ACE for the admins group, and we need a |