d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug that prevented the deletion of non-default ACLs from being

Browse Source 
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
This commit is contained in:
Robert Watson 2002-06-27 19:31:15 +00:00
parent cbeb840245
commit 600c1a5a8e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/kern_acl.c
View File

@ -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);

2
sys/kern/subr_acl_posix1e.c
View File

@ -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);

2
sys/kern/vfs_acl.c
View File

@ -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);