git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #1977: zfs allow arguments not parsed correctly after pyzfs removal
[zfs.git]
/
cmd
/
zfs
/
zfs_main.c
diff --git
a/cmd/zfs/zfs_main.c
b/cmd/zfs/zfs_main.c
index
3bcf626
..
f5a43c1
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 (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 201
1
Nexenta Systems, Inc. All rights reserved.
+ * Copyright 201
2
Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2011 by Delphix. 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);
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 {
opts->prt_perms = B_TRUE;
opts->dataset = argv[argc-1];
} else {