diff options
| author | mm <mm@FreeBSD.org> | 2012-11-26 12:24:39 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-11-26 12:24:39 +0000 |
| commit | f906bfd159c71ea043e936996ec3293b31526451 (patch) | |
| tree | 389030d4b2e59bfc70c9aeaefa1e9714ce00c789 /sys/cddl/contrib/opensolaris/common/zfs | |
| parent | 6c15e1ad42a2d21abd42d20103bdc940ca0f971a (diff) | |
| download | FreeBSD-src-f906bfd159c71ea043e936996ec3293b31526451.zip FreeBSD-src-f906bfd159c71ea043e936996ec3293b31526451.tar.gz | |
MFV r243395:
Introduce a new dataset aclmode setting "restricted" to protect ACL's
being destroyed or corrupted by a drive-by chmod.
illumos-gate 13889:a67716f16746
3254 add support in zfs for aclmode=restricted
References:
https://www.illumos.org/issues/3254
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common/zfs')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c index 398963a..5f5b8da 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c @@ -109,6 +109,7 @@ zfs_prop_init(void) { "discard", ZFS_ACL_DISCARD }, { "groupmask", ZFS_ACL_GROUPMASK }, { "passthrough", ZFS_ACL_PASSTHROUGH }, + { "restricted", ZFS_ACL_RESTRICTED }, { NULL } }; @@ -217,7 +218,8 @@ zfs_prop_init(void) "hidden | visible", "SNAPDIR", snapdir_table); zprop_register_index(ZFS_PROP_ACLMODE, "aclmode", ZFS_ACL_DISCARD, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, - "discard | groupmask | passthrough", "ACLMODE", acl_mode_table); + "discard | groupmask | passthrough | restricted", "ACLMODE", + acl_mode_table); zprop_register_index(ZFS_PROP_ACLINHERIT, "aclinherit", ZFS_ACL_RESTRICTED, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "discard | noallow | restricted | passthrough | passthrough-x", |
