aboutsummaryrefslogtreecommitdiffstats
path: root/tests/zfs-tests
diff options
context:
space:
mode:
authorMatthew Ahrens <[email protected]>2020-06-22 09:46:37 -0700
committerGitHub <[email protected]>2020-06-22 09:46:37 -0700
commit540493ba4f92df1cd3aa18336734cc07702b8bfb (patch)
tree5e30c8ef74a213c9471fece4c697d289da3c1444 /tests/zfs-tests
parent745ace3f24299d0c319950db53012db2a0096d50 (diff)
Clarify comments in config/*.m4, vdev_geom.c, zfs_allow_*.ksh
Rephrase comments to be more clear. Reviewed-by: Serapheim Dimitropoulos <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Ryan Moeller <[email protected]> Signed-off-by: Matthew Ahrens <[email protected]> Closes #10481
Diffstat (limited to 'tests/zfs-tests')
-rwxr-xr-xtests/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh5
-rwxr-xr-xtests/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh12
2 files changed, 9 insertions, 8 deletions
diff --git a/tests/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh b/tests/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh
index ea43fcf03..f3213254b 100755
--- a/tests/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh
+++ b/tests/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh
@@ -66,7 +66,7 @@ log_must zfs create $childfs
log_must zfs create $grandchild
#
-# Setting different permissions to the same set on two level.
+# Setting different permissions to the same set on two levels.
# But only assign the user at one level.
#
log_must zfs allow -s @set $perms1 $ROOT_TESTFS
@@ -74,7 +74,8 @@ log_must zfs allow -s @set $perms2 $childfs
log_must zfs allow $STAFF1 @set $childfs
#
-# Verify only perms2 is valid to user on the level which he was assigned.
+# Verify that the user only has the permissions that they were assigned
+# in each filesystem.
#
log_must verify_noperm $ROOT_TESTFS $perms1 $STAFF1
for fs in $childfs $grandchild ; do
diff --git a/tests/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh b/tests/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh
index 48de842b7..b0e1df32a 100755
--- a/tests/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh
+++ b/tests/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh
@@ -33,13 +33,13 @@
#
# DESCRIPTION:
-# non-root user can allow any permissions which he is holding to
-# other else user when it get 'allow' permission.
+# A non-root user can use 'zfs allow' to delegate permissions that
+# they have, if they also have the 'allow' permission.
#
# STRATEGY:
# 1. Set two set permissions to two datasets locally.
-# 2. Verify the non-root user can allow permission if he has allow
-# permission.
+# 2. Verify the non-root user can use 'zfs allow' if they have
+# 'allow' permission.
#
verify_runnable "both"
@@ -69,8 +69,8 @@ for dtst in $DATASETS ; do
log_must user_run $STAFF1 zfs allow -l $OTHER1 $perms1 $dtst
log_must verify_perm $dtst $perms1 $OTHER1
- # $perms2 was not allow to $STAFF1, so he have no permission to
- # delegate permission to other else.
+ # $perms2 was not allowed to $STAFF1, so they do not have
+ # permission to delegate permission to other users.
log_mustnot user_run $STAFF1 zfs allow $OTHER1 $perms2 $dtst
log_must verify_noperm $dtst $perms2 $OTHER1
done