PERFORCE change 147299 for review

[Edward Tomasz Napierala]

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

Change 147299 by trasz at trasz_traszkan on 2008/08/13 14:03:25

	Be slightly more strict in acl_nfs4_check.

Affected files ...

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

Differences ...

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

@@ -974,14 +974,23 @@
 		case ACL_GROUP_OBJ:
 		case ACL_EVERYONE:
 			if (entry->ae_id != ACL_UNDEFINED_ID) {
+#if 0
 				printf("ae_id is not ACL_UNDEFINED_ID, "
-				    "although it should be.\n");
+				    "but it should be.\n");
+#endif
 				return (EINVAL);
 			}
 			break;
 
 		case ACL_USER:
 		case ACL_GROUP:
+			if (entry->ae_id == ACL_UNDEFINED_ID) {
+#if 0
+				printf("ae_id is ACL_UNDEFINED_ID, "
+				    "but it shouldn't be.\n");
+#endif
+				return (EINVAL);
+			}
 			break;
 
 		default: