Fix 'zfs allow' for create time permissions

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

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 1a91b031a24263d9a8639d3933da3a1ebfdf07a3..dcfb6e80a48c82d30c2c96bace3ac4effc8b0e7d 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -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;
                }
 

diff --git a/man/man8/zfs.8 b/man/man8/zfs.8
index 935d19c326fe8094e8fed40343dee0462a136a61..00196d9bd680018bb4558cc3da33783baf6874b3 100644 (file)
--- a/man/man8/zfs.8
+++ b/man/man8/zfs.8
@@ -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

diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index 0a4b26c0663874fa826cf61545a6c394fe705835..0090fe30db447bf873f54b206debb51a033e563b 100644 (file)
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -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',