MFV r299449: 6763 aclinherit=restricted masks inherited permissions by group
perms (groupmask) Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com> Author: Albert Lee <trisk@nexenta.com> openzfs/openzfs@eebb483d0c
This commit is contained in:
commit
85a69dbf66
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=299450
@ -1408,11 +1408,10 @@ zfs_acl_chmod(vtype_t vtype, uint64_t mode, boolean_t trim, zfs_acl_t *aclp)
|
||||
} else {
|
||||
|
||||
/*
|
||||
* Limit permissions to be no greater than
|
||||
* group permissions.
|
||||
* The "aclinherit" and "aclmode" properties
|
||||
* affect policy for create and chmod(2),
|
||||
* respectively.
|
||||
* Limit permissions granted by ACEs to be no greater
|
||||
* than permissions of the requested group mode.
|
||||
* Applies when the "aclmode" property is set to
|
||||
* "groupmask".
|
||||
*/
|
||||
if ((type == ALLOW) && trim)
|
||||
access_mask &= masks.group;
|
||||
@ -1730,7 +1729,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
|
||||
acl_ids->z_aclp->z_hints |= (vap->va_type == VDIR) ?
|
||||
ZFS_ACL_AUTO_INHERIT : 0;
|
||||
zfs_acl_chmod(vap->va_type, acl_ids->z_mode,
|
||||
(zfsvfs->z_acl_inherit == ZFS_ACL_RESTRICTED),
|
||||
(zfsvfs->z_acl_mode == ZFS_ACL_GROUPMASK),
|
||||
acl_ids->z_aclp);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user