svn commit: r230449 - head/cddl/contrib/opensolaris/cmd/zfs
Martin Matuska
mm at FreeBSD.org
Sun Jan 22 08:06:37 UTC 2012
Author: mm
Date: Sun Jan 22 08:06:36 2012
New Revision: 230449
URL: http://svn.freebsd.org/changeset/base/230449
Log:
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)
MFC after: 1 week
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Jan 22 06:00:50 2012 (r230448)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Jan 22 08:06:36 2012 (r230449)
@@ -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-2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
* All rights reserved.
@@ -4501,7 +4501,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 {
@@ -4988,9 +4988,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);
}
@@ -5000,7 +5000,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;
}
More information about the svn-src-all
mailing list