svn commit: r230730 - stable/9/cddl/contrib/opensolaris/cmd/zfs

[Martin Matuska]

Author: mm
Date: Sun Jan 29 12:25:21 2012
New Revision: 230730
URL: http://svn.freebsd.org/changeset/base/230730

Log:
  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)

Modified:
  stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Jan 29 11:00:00 2012	(r230729)
+++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Jan 29 12:25:21 2012	(r230730)
@@ -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 <pawel at dawidek.net>.
  * All rights reserved.
@@ -4489,7 +4489,7 @@ parse_allow_args(int argc, char **argv, 
 		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 {
@@ -4976,9 +4976,9 @@ zfs_do_allow_unallow_impl(int argc, char
 	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);
 	}
@@ -4988,7 +4988,7 @@ zfs_do_allow_unallow_impl(int argc, char
 
 	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;
 	}