From owner-p4-projects@FreeBSD.ORG  Fri Jul  4 09:46:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 34B29106567A; Fri,  4 Jul 2008 09:46:45 +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 ECFD21065674
	for <perforce@freebsd.org>; Fri,  4 Jul 2008 09:46:44 +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 DABCE8FC12
	for <perforce@freebsd.org>; Fri,  4 Jul 2008 09:46:44 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m649kiUB079427
	for <perforce@freebsd.org>; Fri, 4 Jul 2008 09:46:44 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m649kiW5079425
	for perforce@freebsd.org; Fri, 4 Jul 2008 09:46:44 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 4 Jul 2008 09:46:44 GMT
Message-Id: <200807040946.m649kiW5079425@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 144607 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: Fri, 04 Jul 2008 09:46:45 -0000

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

Change 144607 by trasz@trasz_traszkan on 2008/07/04 09:45:48

	Fix obvious bug in ACL recalculation.

Affected files ...

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

Differences ...

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

@@ -429,29 +429,29 @@
 		if (entry->ae_tag == ACL_USER && entry->ae_id == file_owner_id)
 			amode = amode >> 3;
 
-		if (entry->ae_perm | ACL_READ_DATA) {
-			if (amode | ACL_READ)
+		if (entry->ae_perm & ACL_READ_DATA) {
+			if (amode & ACL_READ)
 				previous->ae_perm &= ~ACL_READ_DATA;
 			else
 				previous->ae_perm |= ACL_READ_DATA;
 		}
 
-		if (entry->ae_perm | ACL_WRITE_DATA) {
-			if (amode | ACL_WRITE)
+		if (entry->ae_perm & ACL_WRITE_DATA) {
+			if (amode & ACL_WRITE)
 				previous->ae_perm &= ~ACL_WRITE_DATA;
 			else
 				previous->ae_perm |= ACL_WRITE_DATA;
 		}
 
-		if (entry->ae_perm | ACL_APPEND_DATA) {
-			if (amode | ACL_WRITE)
+		if (entry->ae_perm & ACL_APPEND_DATA) {
+			if (amode & ACL_WRITE)
 				previous->ae_perm &= ~ACL_APPEND_DATA;
 			else
 				previous->ae_perm |= ACL_APPEND_DATA;
 		}
 
-		if (entry->ae_perm | ACL_EXECUTE) {
-			if (amode | ACL_EXECUTE)
+		if (entry->ae_perm & ACL_EXECUTE) {
+			if (amode & ACL_EXECUTE)
 				previous->ae_perm &= ~ACL_EXECUTE;
 			else
 				previous->ae_perm |= ACL_EXECUTE;