Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Jul 2008 09:46:44 GMT
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 144607 for review
Message-ID:  <200807040946.m649kiW5079425@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807040946.m649kiW5079425>