changeset 13562:7bae99960928

1977 zfs allow arguments not parsed correctly after pyzfs removal Reviewed by: Garrett D'Amore <garrett.damore@gmail.com> Reviewed by: Albert Lee <trisk@nexenta.com> Approved by: Richard Lowe <richlowe@richlowe.net>
author Alexander Eremin <a.eremin@nexenta.com>
date Mon, 16 Jan 2012 17:07:04 +0400
parents 7ec47d2d30bc
children fdbd5ad458de
files usr/src/cmd/zfs/zfs_main.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/zfs/zfs_main.c	Sun May 15 09:25:05 2011 +0100
+++ b/usr/src/cmd/zfs/zfs_main.c	Mon Jan 16 17:07:04 2012 +0400
@@ -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.
  */
 
@@ -4449,7 +4449,7 @@
 		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 {