From e481b3cadfa316bbbc663e972609ea3ed23fa18d Mon Sep 17 00:00:00 2001 From: mm Date: Sun, 29 Jan 2012 12:25:21 +0000 Subject: [PATCH 071/175] MFC r230449: Merge illumos revisions 13540, 13562: illumos rev 13540 [1]: Removal of pyzfs broke delegation for volumes illumos rev 13562 [2]: zfs allow arguments not parsed correctly after pyzfs removal References: https://www.illumos.org/issues/1726 [1] https://www.illumos.org/issues/1977 [2] Obtained from: illumos (issues #1726, #1977) git-svn-id: http://svn.freebsd.org/base/stable/9@230730 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit f017910911748f5a3e98a0a74abe0902d9c3e595) Signed-off-by: Xin Li --- cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index 78037d4..1a21be4 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. * Copyright (c) 2011 Pawel Jakub Dawidek . * Copyright (c) 2011 Martin Matuska . All rights reserved. @@ -4488,7 +4488,7 @@ parse_allow_args(int argc, char **argv, boolean_t un, struct allow_opts *opts) argc--; argv++; opts->dataset = munge_args(argc, argv, un, 2, &opts->perms); - } else if (argc == 1) { + } else if (argc == 1 && !un) { opts->prt_perms = B_TRUE; opts->dataset = argv[argc-1]; } else { @@ -4975,9 +4975,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); } @@ -4987,7 +4987,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; } -- 1.7.9.4