From owner-p4-projects@FreeBSD.ORG  Fri Jul  4 12:16:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B9BE1065695; Fri,  4 Jul 2008 12:16:15 +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 0E63D106568A
	for <perforce@freebsd.org>; Fri,  4 Jul 2008 12:16:15 +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 F0F0F8FC18
	for <perforce@freebsd.org>; Fri,  4 Jul 2008 12:16:14 +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 m64CGEVU096319
	for <perforce@freebsd.org>; Fri, 4 Jul 2008 12:16:14 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m64CGEML096317
	for perforce@freebsd.org; Fri, 4 Jul 2008 12:16:14 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 4 Jul 2008 12:16:14 GMT
Message-Id: <200807041216.m64CGEML096317@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 144608 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 12:16:15 -0000

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

Change 144608 by trasz@trasz_traszkan on 2008/07/04 12:15:35

	Remove incorrect check, which was breaking inheritance.

Affected files ...

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

Differences ...

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

@@ -753,10 +753,6 @@
 		parent_entry = &(parent_aclp->acl_entry[i]);
 
 		if (((parent_entry->ae_flags &
-		    ACL_ENTRY_DIRECTORY_INHERIT) == 0) && is_directory)
-			continue;
-
-		if (((parent_entry->ae_flags &
 		    ACL_ENTRY_FILE_INHERIT) == 0) && !is_directory)
 			continue;