From e2742d467a9f02803582787a111c6bb260969d15 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 31 Aug 2015 16:56:14 +0200 Subject: [PATCH] * sec_acl.cc (get_posix_access): Fix class_perm in !new_style case. Signed-off-by: Corinna Vinschen --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/sec_acl.cc | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3a280edb5..987b4c008 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2015-11-18 Corinna Vinschen + + * sec_acl.cc (get_posix_access): Fix class_perm in !new_style case. + 2015-11-18 Corinna Vinschen Reapply POSIX ACL changes. 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