svn commit: r299449 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Wed May 11 13:46:44 2016
New Revision: 299449
URL: https://svnweb.freebsd.org/changeset/base/299449

Log:
  6763 aclinherit=restricted masks inherited permissions by group
  perms (groupmask)
  
  Reviewed by: Gordon Ross <gwr at nexenta.com>
  Reviewed by: Yuri Pankov <yuri.pankov at nexenta.com>
  Author: Albert Lee <trisk at nexenta.com>
  
  openzfs/openzfs at eebb483d0cd68bdc4cf03c01fdeba9af160c17af

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c	Wed May 11 13:43:20 2016	(r299448)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_acl.c	Wed May 11 13:46:44 2016	(r299449)
@@ -1411,11 +1411,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;
@@ -1729,7 +1728,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);
 		}
 	}