summaryrefslogtreecommitdiff
path: root/usr/src/common/zfs
diff options
context:
space:
mode:
authorRic Aleshire <Ric.Aleshire@Sun.COM>2009-11-05 16:04:34 -0800
committerRic Aleshire <Ric.Aleshire@Sun.COM>2009-11-05 16:04:34 -0800
commit4201a95e0468170d576f82c3aa63afecf718497a (patch)
tree4c5de4303038a3c31e30020e4b0a51ece5332076 /usr/src/common/zfs
parente8dc8350fed16771b8b46518216b74a2ff1a6c7b (diff)
downloadillumos-joyent-4201a95e0468170d576f82c3aa63afecf718497a.tar.gz
PSARC 2009/348 Security Labels for ZFS
6795907 Add label attribute to ZFS datasets --HG-- rename : usr/src/lib/libtsol/common/ltos.c => usr/src/common/tsol/ltos.c rename : usr/src/lib/libtsol/common/stol.c => usr/src/common/tsol/stol.c
Diffstat (limited to 'usr/src/common/zfs')
-rw-r--r--usr/src/common/zfs/zfs_prop.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c
index 8295e8b8f9..f65602d12c 100644
--- a/usr/src/common/zfs/zfs_prop.c
+++ b/usr/src/common/zfs/zfs_prop.c
@@ -293,6 +293,8 @@ zfs_prop_init(void)
ZFS_TYPE_DATASET, "filesystem | volume | snapshot", "TYPE");
register_string(ZFS_PROP_SHARESMB, "sharesmb", "off", PROP_INHERIT,
ZFS_TYPE_FILESYSTEM, "on | off | sharemgr(1M) options", "SHARESMB");
+ register_string(ZFS_PROP_MLSLABEL, "mlslabel", ZFS_MLSLABEL_DEFAULT,
+ PROP_INHERIT, ZFS_TYPE_DATASET, "<sensitivity label>", "MLSLABEL");
/* readonly number properties */
register_number(ZFS_PROP_USED, "used", 0, PROP_READONLY,
@@ -369,6 +371,11 @@ boolean_t
zfs_prop_delegatable(zfs_prop_t prop)
{
zprop_desc_t *pd = &zfs_prop_table[prop];
+
+ /* The mlslabel property is never delegatable. */
+ if (prop == ZFS_PROP_MLSLABEL)
+ return (B_FALSE);
+
return (pd->pd_attr != PROP_READONLY);
}