Author: mav
Date: Wed May 11 13:48:15 2016
New Revision: 299450
URL: https://svnweb.freebsd.org/changeset/base/299450
Log:
MFV r299449: 6763 aclinherit=restricted masks inherited permissions by group
perms (groupmask)
Reviewed by: Gordon Ross <g...@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pan...@nexenta.com>
Author: Albert Lee <tr...@nexenta.com>
openzfs/openzfs@eebb483d0cd68bdc4cf03c01fdeba9af160c17af
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Wed May
11 13:46:44 2016 (r299449)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Wed May
11 13:48:15 2016 (r299450)
@@ -1408,11 +1408,10 @@ zfs_acl_chmod(vtype_t vtype, uint64_t mo
} 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 fla
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);
}
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
