From owner-p4-projects@FreeBSD.ORG  Fri Jul  4 13:24:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A78E0106567B; Fri,  4 Jul 2008 13:24:24 +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 669AE106564A
	for <perforce@freebsd.org>; Fri,  4 Jul 2008 13:24:24 +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 557238FC1E
	for <perforce@freebsd.org>; Fri,  4 Jul 2008 13:24:24 +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 m64DOO9G012144
	for <perforce@freebsd.org>; Fri, 4 Jul 2008 13:24:24 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m64DOOWE012142
	for perforce@freebsd.org; Fri, 4 Jul 2008 13:24:24 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 4 Jul 2008 13:24:24 GMT
Message-Id: <200807041324.m64DOOWE012142@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 144615 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 13:24:24 -0000

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

Change 144615 by trasz@trasz_traszkan on 2008/07/04 13:23:48

	Fix previous fix.

Affected files ...

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

Differences ...

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

@@ -756,6 +756,11 @@
 		    ACL_ENTRY_FILE_INHERIT) == 0) && !is_directory)
 			continue;
 
+		if ((parent_entry->ae_flags &
+		    (ACL_ENTRY_DIRECTORY_INHERIT |
+		    ACL_ENTRY_FILE_INHERIT)) == 0)
+			continue;
+
 		KASSERT(child_aclp->acl_cnt < ACL_MAX_ENTRIES,
 		    "child_aclp->acl_cnt < ACL_MAX_ENTRIES");
 		child_aclp->acl_entry[child_aclp->acl_cnt] = *parent_entry;