PERFORCE change 147388 for review

[Edward Tomasz Napierala]

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

Change 147388 by trasz at 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);
 				}
 			}