d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'zfs allow' for create time permissions

Browse Source 
When no permission set is defined for a dataset the create time
permissions are incorrectly shown as if they were a permission set.
This change simply correct how allow permissions are displayed.

This commit also fixes a small manpage formatting issue and adds the
"zfs_allow_003_pos" test case to the ZFS Test Suite.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #7519 
Closes #7860
This commit is contained in:
LOLi 2018-09-06 22:11:21 +02:00 committed by Brian Behlendorf
parent cc99f275a2
commit 0238a9755b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/zfs/zfs_main.c
View File

@ -5476,7 +5476,6 @@ print_set_creat_perms(uu_avl_t *who_avl)
gettext("Create time permissions:\n"),
NULL
};
const char **title_ptr = sc_title;
who_perm_node_t *who_node = NULL;
int prev_weight = -1;
@ -5490,7 +5489,7 @@ print_set_creat_perms(uu_avl_t *who_avl)
deleg_perm_node_t *deleg_node;
if (prev_weight != weight) {
(void) printf("%s", *title_ptr++);
(void) printf("%s", sc_title[weight]);
prev_weight = weight;
}

6
man/man8/zfs.8
View File

@ -4049,7 +4049,8 @@ command restricts modifications of the global namespace to the root user.
.Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
.Ar setname Oc Ns ...
.Ar filesystem Ns | Ns Ar volume
.br
.Xc
.It Xo
.Nm
.Cm allow
.Op Fl dl
@ -4232,7 +4233,8 @@ and can be no more than 64 characters long.
.Oo Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
.Ar setname Oc Ns ... Oc
.Ar filesystem Ns | Ns Ar volume
.br
.Xc
.It Xo
.Nm
.Cm unallow
.Op Fl dlr

2
tests/runfiles/linux.run
View File

@ -513,7 +513,7 @@ post =
tags = ['functional', 'deadman']
[tests/functional/delegate]
tests = ['zfs_allow_001_pos', 'zfs_allow_002_pos',
tests = ['zfs_allow_001_pos', 'zfs_allow_002_pos', 'zfs_allow_003_pos',
'zfs_allow_004_pos', 'zfs_allow_005_pos', 'zfs_allow_006_pos',
'zfs_allow_007_pos', 'zfs_allow_008_pos', 'zfs_allow_009_neg',
'zfs_allow_010_pos', 'zfs_allow_011_neg', 'zfs_allow_012_neg',