From owner-svn-src-all@FreeBSD.ORG  Fri Jun  5 14:15:01 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FCBC1065687;
	Fri,  5 Jun 2009 14:15:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 18F248FC12;
	Fri,  5 Jun 2009 14:15:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55EF0PO028117;
	Fri, 5 Jun 2009 14:15:00 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55EF072028116;
	Fri, 5 Jun 2009 14:15:00 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906051415.n55EF072028116@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 5 Jun 2009 14:15:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193507 - head/sys/fs/nfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jun 2009 14:15:02 -0000

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