diff options
| author | rwatson <rwatson@FreeBSD.org> | 2002-06-27 19:31:15 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2002-06-27 19:31:15 +0000 |
| commit | c282ad9b24d3ac235eae204b26d9107d5d10b291 (patch) | |
| tree | efe4909d480778cf86a255206f5e35e8b2627333 /sys | |
| parent | 99f90043d5c4e5a0a8cbac2ceb0857ebdcb39d4f (diff) | |
| download | FreeBSD-src-c282ad9b24d3ac235eae204b26d9107d5d10b291.zip FreeBSD-src-c282ad9b24d3ac235eae204b26d9107d5d10b291.tar.gz | |
Fix a bug that prevented the deletion of non-default ACLs from being
passed down the VFS stack. While I'm here, replace a '0' with a 'NULL'
to make the code more readable.
Sponsored by: DARPA, NAI Labs
Obtained from: TrustedBSD Project
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_acl.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_acl_posix1e.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_acl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c index 4541e12..70be0ec 100644 --- a/sys/kern/kern_acl.c +++ b/sys/kern/kern_acl.c @@ -621,7 +621,7 @@ vacl_delete(struct thread *td, struct vnode *vp, acl_type_t type) return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); + error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c index 4541e12..70be0ec 100644 --- a/sys/kern/subr_acl_posix1e.c +++ b/sys/kern/subr_acl_posix1e.c @@ -621,7 +621,7 @@ vacl_delete(struct thread *td, struct vnode *vp, acl_type_t type) return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); + error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index 4541e12..70be0ec 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -621,7 +621,7 @@ vacl_delete(struct thread *td, struct vnode *vp, acl_type_t type) return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); + error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); |
