Illumos #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>

References:
  https://www.illumos.org/issues/1977

Ported by: Martin Matuska <martin@matuska.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 3bcf6267d6faea5d026e56eb174696a90acb2604..f5a43c145444ee4de76bfbcf379934e0776a2bf9 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/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.
  */
 
@@ -4480,7 +4480,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 {