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 ())
/* From the SECURITY_DESCRIPTOR given in psd, compute user, owner, posix
attributes, as well as the POSIX acl. The function returns the number
- of entries returned in aclbufp, or -1 in case of error. */
+ of entries returned in aclbufp, or -1 in case of error.
+
+ When called from chmod, it also returns the fact if the ACL is a "standard"
+ ACL. A "standard" ACL is an ACL which only consists of ACEs for owner,
+ group, other, as well as (this is Windows) the Administrators group and
+ SYSTEM. See fhandler_disk_file::fchmod for how this is used to fake
+ stock POSIX perms even if Administrators and SYSTEM is in the ACE. */
int
get_posix_access (PSECURITY_DESCRIPTOR psd,
mode_t *attr_ret, uid_t *uid_ret, gid_t *gid_ret,
- aclent_t *aclbufp, int nentries)
+ aclent_t *aclbufp, int nentries, bool *std_acl)
{
tmp_pathbuf tp;
NTSTATUS status;
GROUP_OBJ entry. */
if (ace_sid != well_known_system_sid
&& ace_sid != well_known_admins_sid)
- class_perm |= lacl[pos].a_perm;
+ {
+ class_perm |= lacl[pos].a_perm;
+ standard_ACEs_only = false;
+ }
}
}
/* For a newly created file, we'd like to know if we're running
a standard ACL, we apply umask. That's not entirely correct,
but it's probably the best we can do. */
else if (type & (USER | GROUP)
- && just_created
&& standard_ACEs_only
&& ace_sid != well_known_system_sid
&& ace_sid != well_known_admins_sid)
aclbufp[idx].a_perm &= S_IRWXO;
aclsort32 (pos, 0, aclbufp);
}
+ if (std_acl)
+ *std_acl = standard_ACEs_only;
return pos;
}
PSECURITY_DESCRIPTOR set_posix_access (mode_t, uid_t, gid_t, struct acl *, int,
security_descriptor &, bool);
int get_posix_access (PSECURITY_DESCRIPTOR, mode_t *, uid_t *, gid_t *,
- struct acl *, int);
+ struct acl *, int, bool * = NULL);
int getacl (HANDLE, path_conv &, int, struct acl *);
int setacl (HANDLE, path_conv &, int, struct acl *, bool &);