From owner-p4-projects@FreeBSD.ORG  Wed Aug 13 14:04:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFE921065670; Wed, 13 Aug 2008 14:04:23 +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 838EE106567A
	for <perforce@freebsd.org>; Wed, 13 Aug 2008 14:04:23 +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 7BFE68FC1F
	for <perforce@freebsd.org>; Wed, 13 Aug 2008 14:04:23 +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 m7DE4NSK049619
	for <perforce@freebsd.org>; Wed, 13 Aug 2008 14:04:23 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7DE4N63049617
	for perforce@freebsd.org; Wed, 13 Aug 2008 14:04:23 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 13 Aug 2008 14:04:23 GMT
Message-Id: <200808131404.m7DE4N63049617@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 147299 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: Wed, 13 Aug 2008 14:04:24 -0000

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

Change 147299 by trasz@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: