diff options
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 4ee67e20d..7d729e3ad 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -787,35 +787,35 @@ fhandler_disk_file::fchmod (mode_t mode) gid_t gid; tmp_pathbuf tp; aclent_t *aclp; + bool standard_acl = false; int nentries, idx; if (!get_file_sd (get_handle (), pc, sd, false)) { aclp = (aclent_t *) tp.c_get (); if ((nentries = get_posix_access (sd, NULL, &uid, &gid, - aclp, MAX_ACL_ENTRIES)) >= 0) + aclp, MAX_ACL_ENTRIES, + &standard_acl)) >= 0) { /* Overwrite ACL permissions as required by POSIX 1003.1e draft 17. */ aclp[0].a_perm = (mode >> 6) & S_IRWXO; -#if 0 - /* Deliberate deviation from POSIX 1003.1e here. We're not - writing CLASS_OBJ *or* GROUP_OBJ, but both. Otherwise we're - going to be in constant trouble with user expectations. */ - if ((idx = searchace (aclp, nentries, GROUP_OBJ)) >= 0) - aclp[idx].a_perm = (mode >> 3) & S_IRWXO; - if (nentries > MIN_ACL_ENTRIES - && (idx = searchace (aclp, nentries, CLASS_OBJ)) >= 0) - aclp[idx].a_perm = (mode >> 3) & S_IRWXO; -#else + /* POSIXly correct: If CLASS_OBJ is present, chmod only modifies - CLASS_OBJ, not GROUP_OBJ. */ + CLASS_OBJ, not GROUP_OBJ. + + Deliberate deviation from POSIX 1003.1e: If the ACL is a + "standard" ACL, that is, it only contains POSIX permissions + as well as entries for the Administrators group and SYSTEM, + then it's kind of a POSIX-only ACL in a twisted, Windowsy + way. If so, we change GROUP_OBJ and CLASS_OBJ perms. */ + if (standard_acl + && (idx = searchace (aclp, nentries, GROUP_OBJ)) >= 0) + aclp[idx].a_perm = (mode >> 3) & S_IRWXO; if (nentries > MIN_ACL_ENTRIES && (idx = searchace (aclp, nentries, CLASS_OBJ)) >= 0) aclp[idx].a_perm = (mode >> 3) & S_IRWXO; - else if ((idx = searchace (aclp, nentries, GROUP_OBJ)) >= 0) - aclp[idx].a_perm = (mode >> 3) & S_IRWXO; -#endif + if ((idx = searchace (aclp, nentries, OTHER_OBJ)) >= 0) aclp[idx].a_perm = mode & S_IRWXO; if (pc.isdir ()) |