summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2008-11-06 22:28:04 +0000
committertrasz <trasz@FreeBSD.org>2008-11-06 22:28:04 +0000
commit3c1e5036f65b09fe87dfd52e7712f63f47b004cc (patch)
treea4cc9b71ded510ccb16601fe3d3857066168b7db
parente7107444e01a01d21e54dcc617e81eb76c2a0288 (diff)
downloadFreeBSD-src-3c1e5036f65b09fe87dfd52e7712f63f47b004cc.zip
FreeBSD-src-3c1e5036f65b09fe87dfd52e7712f63f47b004cc.tar.gz
Backoff the last patch. It was overly restrictive - we want to check
for write permission on target only when moving the target between two directories. Approved by: rwatson (mentor)
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
index df0db5f..dd94618 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
@@ -1580,14 +1580,7 @@ zfs_zaccess_rename(znode_t *sdzp, znode_t *szp, znode_t *tdzp,
/*
* Rename permissions are combination of delete permission +
* add file/subdir permission.
- *
- * BSD operating systems also require write permission
- * on the directory being moved.
*/
- if (ZTOV(szp)->v_type == VDIR) {
- if (error = zfs_zaccess(szp, ACE_WRITE_DATA, cr))
- return (error);
- }
/*
* first make sure we do the delete portion.
OpenPOWER on IntegriCloud