From 37ba986a5f09503ef894f71ed3ed1d5f8acf0a53 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 5 Jun 2009 14:15:00 +0000 Subject: [PATCH] Don't check MAC in the NFS server ACL set path, right now we aren't enforcing MAC for NFS clients. --- sys/fs/nfs/nfs_commonacl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c index 13d904345f8d..99d796eeb088 100644 --- a/sys/fs/nfs/nfs_commonacl.c +++ b/sys/fs/nfs/nfs_commonacl.c @@ -703,10 +703,6 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp, struct ucred *cred, if (aclp->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) return (NFSERR_ATTRNOTSUPP); error = VOP_ACLCHECK(vp, ACL_TYPE_NFS4, aclp, cred, p); -#ifdef MAC - if (!error) - error = mac_check_vnode_setacl(cred, vp, ACL_TYPE_NFS4, aclp); -#endif if (!error) error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p); return (error);