From owner-p4-projects@FreeBSD.ORG  Mon Aug  4 13:41:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B2281065678; Mon,  4 Aug 2008 13:41:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E9501065676
	for <perforce@freebsd.org>; Mon,  4 Aug 2008 13:41:15 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 318428FC25
	for <perforce@freebsd.org>; Mon,  4 Aug 2008 13:41:15 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m74DfFxm056726
	for <perforce@freebsd.org>; Mon, 4 Aug 2008 13:41:15 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m74DfFV8056724
	for perforce@freebsd.org; Mon, 4 Aug 2008 13:41:15 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 4 Aug 2008 13:41:15 GMT
Message-Id: <200808041341.m74DfFV8056724@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 146620 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2008 13:41:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=146620

Change 146620 by trasz@trasz_traszkan on 2008/08/04 13:40:37

	Add check for ACL_READ_ACL, which apparently got lost somewhere.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/TODO#27 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/TODO#27 (text+ko) ====

@@ -5,6 +5,10 @@
 - Correctly handle the situation in which we can stat, but cannot
   read ACL, in ls(1).
 
+- Clean up #defines.  For example, make VREAD_NAMED_ATTRS equal
+  to ACL_READ_NAMED_ATTRS, so there is no need for translation
+  between the two in kern/subr_acl_nfs4.c.
+
 - Decide what to do with write vs append on regular files.
 
 - Either add or extend existing manual pages for new API routines:

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#6 (text+ko) ====

@@ -241,11 +241,14 @@
 	if (error != 0)
 		goto out;
 #endif
+	error = VOP_ACCESS(vp, VREAD_ACL, td->td_ucred, td);
+	if (error != 0)
+		goto out;
+
 	error = VOP_GETACL(vp, type_unold(type), &inkernelacl,
 	    td->td_ucred, td);
-#ifdef MAC
+
 out:
-#endif
 	VOP_UNLOCK(vp, 0);
 	if (error == 0)
 		error = copyout_acl(&inkernelacl, aclp, type);