diff options
| author | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-05-06 15:16:09 -0600 |
|---|---|---|
| committer | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-05-06 15:16:09 -0600 |
| commit | 485adf6194d7a711f1a48d816798e4481c28dae5 (patch) | |
| tree | 53bdb3b924ac5c5623eea4c17d643337a6174051 /usr/src | |
| parent | 9a8685acb1980e757acb4b2fdbb106654ef61317 (diff) | |
| download | illumos-joyent-485adf6194d7a711f1a48d816798e4481c28dae5.tar.gz | |
6947609 not inheriting inherit_only directories correctly
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_acl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_acl.c b/usr/src/uts/common/fs/zfs/zfs_acl.c index 703f665964..1181bd4433 100644 --- a/usr/src/uts/common/fs/zfs/zfs_acl.c +++ b/usr/src/uts/common/fs/zfs/zfs_acl.c @@ -1633,11 +1633,14 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, vtype_t vtype, zfs_acl_t *paclp, * inherit_only */ if ((iflags & (ACE_FILE_INHERIT_ACE | - ACE_DIRECTORY_INHERIT_ACE)) == - ACE_FILE_INHERIT_ACE) { + ACE_DIRECTORY_INHERIT_ACE)) == ACE_FILE_INHERIT_ACE) { newflags |= ACE_INHERIT_ONLY_ACE; aclp->z_ops.ace_flags_set(acep, newflags|ACE_INHERITED_ACE); + } else { + newflags &= ~ACE_INHERIT_ONLY_ACE; + aclp->z_ops.ace_flags_set(acep, + newflags|ACE_INHERITED_ACE); } } return (aclp); |