From owner-p4-projects@FreeBSD.ORG  Thu Nov 20 08:40:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DFEFC1065675; Thu, 20 Nov 2008 08:40:02 +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 A36FF1065673
	for <perforce@freebsd.org>; Thu, 20 Nov 2008 08:40:02 +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 8D0A98FC0C
	for <perforce@freebsd.org>; Thu, 20 Nov 2008 08:40:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAK8e2Xw060153
	for <perforce@freebsd.org>; Thu, 20 Nov 2008 08:40:02 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAK8e2sZ060151
	for perforce@freebsd.org; Thu, 20 Nov 2008 08:40:02 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 20 Nov 2008 08:40:02 GMT
Message-Id: <200811200840.mAK8e2sZ060151@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 153256 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: Thu, 20 Nov 2008 08:40:03 -0000

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

Change 153256 by trasz@trasz_victim7 on 2008/11/20 08:39:55

	Tweak UFS behaviour to match new ZFS.  It's actually a bug fix - previously
	ZFS did not ignore INHERIT_ONLY entries during file mode calculation.

Affected files ...

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

Differences ...

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

@@ -695,10 +695,8 @@
 		    entry->ae_extended != ACL_EXTENDED_DENY)
 			continue;
 
-#ifdef SunOS_doesnt_do_that
 		if (entry->ae_flags & ACL_ENTRY_ONLY_INHERIT)
 			continue;
-#endif
 
 		if (entry->ae_tag == ACL_USER_OBJ) {
 			if ((entry->ae_perm & ACL_READ_DATA) &&