From owner-p4-projects@FreeBSD.ORG  Thu Aug 14 14:46:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CF10106569B; Thu, 14 Aug 2008 14:46:07 +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 02E011065677
	for <perforce@freebsd.org>; Thu, 14 Aug 2008 14:46:07 +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 E52A18FC22
	for <perforce@freebsd.org>; Thu, 14 Aug 2008 14:46:06 +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 m7EEk6Bo092473
	for <perforce@freebsd.org>; Thu, 14 Aug 2008 14:46:06 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EEk6OZ092471
	for perforce@freebsd.org; Thu, 14 Aug 2008 14:46:06 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 14 Aug 2008 14:46:06 GMT
Message-Id: <200808141446.m7EEk6OZ092471@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 147388 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: Thu, 14 Aug 2008 14:46:07 -0000

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

Change 147388 by trasz@trasz_traszkan on 2008/08/14 14:46:05

	Fix an obvious error (READ | APPEND instead of WRITE | APPEND).
	Remove a redundant check.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#23 edit

Differences ...

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

@@ -429,18 +429,13 @@
 			/*
 			 * 1.5.1.2. The "who" field is the same as the current
 			 *          ACE,
-			 */
-			if (previous->ae_id != entry->ae_id ||
-			    previous->ae_tag != entry->ae_tag)
-				meets = 0;
-
-			/*
+			 *
 			 * 1.5.1.3. The flag bit ACE4_IDENTIFIER_GROUP
 			 *          is the same as it is in the current ACE,
 			 *          and no other flag bits are set,
 			 */
-			if ((previous->ae_tag == ACL_GROUP) !=
-			    (entry->ae_tag == ACL_GROUP))
+			if (previous->ae_id != entry->ae_id ||
+			    previous->ae_tag != entry->ae_tag)
 				meets = 0;
 
 			if (previous->ae_flags)
@@ -551,9 +546,9 @@
 
 				if (extramode & ACL_WRITE) {
 					entry->ae_perm &=
-					    ~(ACL_READ_DATA | ACL_APPEND_DATA);
+					    ~(ACL_WRITE_DATA | ACL_APPEND_DATA);
 					previous->ae_perm &=
-					    ~(ACL_READ_DATA | ACL_APPEND_DATA);
+					    ~(ACL_WRITE_DATA | ACL_APPEND_DATA);
 				}
 			}