svn commit: r193507 - head/sys/fs/nfs

[Robert Watson]

Author: rwatson
Date: Fri Jun  5 14:15:00 2009
New Revision: 193507
URL: http://svn.freebsd.org/changeset/base/193507

Log:
  Don't check MAC in the NFS server ACL set path, right now we aren't
  enforcing MAC for NFS clients.

Modified:
  head/sys/fs/nfs/nfs_commonacl.c

Modified: head/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonacl.c	Fri Jun  5 14:07:00 2009	(r193506)
+++ head/sys/fs/nfs/nfs_commonacl.c	Fri Jun  5 14:15:00 2009	(r193507)
@@ -703,10 +703,6 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp,
 	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);