summaryrefslogtreecommitdiff
path: root/usr/src/cmd/zfs/zfs_main.c
diff options
context:
space:
mode:
authorJohn Sonnenschein <johns@joyent.com>2011-12-15 22:20:12 +0000
committerJohn Sonnenschein <johns@joyent.com>2011-12-15 22:20:12 +0000
commitf9b22ee9e48b04a9ef01426e92a13c5b164c0763 (patch)
tree2bf5259c9bbf8042d3bf39ca737b05a1801d8e4b /usr/src/cmd/zfs/zfs_main.c
parentdf5fe3d22e102695087d81e2376f4037fc56e13b (diff)
parent3abb112f8485b33b6b9b52b340bede0a333c10bf (diff)
downloadillumos-joyent-f9b22ee9e48b04a9ef01426e92a13c5b164c0763.tar.gz
[OS-714] Illumos merge
Diffstat (limited to 'usr/src/cmd/zfs/zfs_main.c')
-rw-r--r--usr/src/cmd/zfs/zfs_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index d041c33029..a72e915c17 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -4969,9 +4969,9 @@ zfs_do_allow_unallow_impl(int argc, char **argv, boolean_t un)
parse_allow_args(argc, argv, un, &opts);
/* try to open the dataset */
- if ((zhp = zfs_open(g_zfs, opts.dataset, ZFS_TYPE_FILESYSTEM))
- == NULL) {
- (void) fprintf(stderr, "Failed to open Dataset *%s*\n",
+ if ((zhp = zfs_open(g_zfs, opts.dataset, ZFS_TYPE_FILESYSTEM |
+ ZFS_TYPE_VOLUME)) == NULL) {
+ (void) fprintf(stderr, "Failed to open dataset: %s\n",
opts.dataset);
return (-1);
}
@@ -4981,7 +4981,7 @@ zfs_do_allow_unallow_impl(int argc, char **argv, boolean_t un)
fs_perm_set_init(&fs_perm_set);
if (parse_fs_perm_set(&fs_perm_set, perm_nvl) != 0) {
- (void) fprintf(stderr, "Failed to parse fsacl permissionsn");
+ (void) fprintf(stderr, "Failed to parse fsacl permissions\n");
goto cleanup1;
}