From owner-svn-src-all@FreeBSD.ORG  Sat Mar 27 15:05:08 2010
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 97F81106564A;
	Sat, 27 Mar 2010 15:05:08 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 864138FC08;
	Sat, 27 Mar 2010 15:05:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2RF57ph019004;
	Sat, 27 Mar 2010 15:05:07 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RF57Lr019002;
	Sat, 27 Mar 2010 15:05:07 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201003271505.o2RF57Lr019002@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 27 Mar 2010 15:05:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205733 - stable/8/sys/security/mac_lomac
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: Sat, 27 Mar 2010 15:05:08 -0000

Author: trasz
Date: Sat Mar 27 15:05:06 2010
New Revision: 205733
URL: http://svn.freebsd.org/changeset/base/205733

Log:
  MFC r201438:
  
  Make mac_lomac(4) able to interpret NFSv4 access bits.
  
  Reviewed by:	rwatson

Modified:
  stable/8/sys/security/mac_lomac/mac_lomac.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/security/mac_lomac/mac_lomac.c
==============================================================================
--- stable/8/sys/security/mac_lomac/mac_lomac.c	Sat Mar 27 15:02:28 2010	(r205732)
+++ stable/8/sys/security/mac_lomac/mac_lomac.c	Sat Mar 27 15:05:06 2010	(r205733)
@@ -2470,7 +2470,7 @@ lomac_vnode_check_open(struct ucred *cre
 	obj = SLOT(vplabel);
 
 	/* XXX privilege override for admin? */
-	if (accmode & (VWRITE | VAPPEND | VADMIN)) {
+	if (accmode & VMODIFY_PERMS) {
 		if (!lomac_subject_dominate(subj, obj))
 			return (EACCES);
 	}