diff options
author | attilio <attilio@FreeBSD.org> | 2011-05-18 16:01:29 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2011-05-18 16:01:29 +0000 |
commit | 6a2b7fdc52eb14729c2189dc85555fa8b5a37cb0 (patch) | |
tree | 8843ca49e1c800870334fadd097bc2fa557439d9 /sys/cddl | |
parent | 0828d417d4beda5c42e8953b1905d327f1da5653 (diff) | |
download | FreeBSD-src-6a2b7fdc52eb14729c2189dc85555fa8b5a37cb0.zip FreeBSD-src-6a2b7fdc52eb14729c2189dc85555fa8b5a37cb0.tar.gz |
MFC
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index f8912ca..ba13747 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -689,6 +689,9 @@ zfs_secpolicy_destroy(zfs_cmd_t *zc, cred_t *cr) * and destroying snapshots requires descendent permissions, a successfull * check of the top level snapshot applies to snapshots of all descendent * datasets as well. + * + * The top level snapshot may not exist when doing a recursive destroy. + * In this case fallback to permissions of the parent dataset. */ static int zfs_secpolicy_destroy_snaps(zfs_cmd_t *zc, cred_t *cr) @@ -700,6 +703,9 @@ zfs_secpolicy_destroy_snaps(zfs_cmd_t *zc, cred_t *cr) error = zfs_secpolicy_destroy_perms(dsname, cr); + if (error == ENOENT) + error = zfs_secpolicy_destroy_perms(zc->zc_name, cr); + strfree(dsname); return (error); } |