From owner-p4-projects@FreeBSD.ORG  Wed Nov 19 18:08:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B74131065670; Wed, 19 Nov 2008 18:08:10 +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 79C391065677
	for <perforce@freebsd.org>; Wed, 19 Nov 2008 18:08:10 +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 69C968FC19
	for <perforce@freebsd.org>; Wed, 19 Nov 2008 18:08:10 +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 mAJI8Avk041548
	for <perforce@freebsd.org>; Wed, 19 Nov 2008 18:08:10 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAJI8ADU041546
	for perforce@freebsd.org; Wed, 19 Nov 2008 18:08:10 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 19 Nov 2008 18:08:10 GMT
Message-Id: <200811191808.mAJI8ADU041546@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 153224 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, 19 Nov 2008 18:08:10 -0000

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

Change 153224 by trasz@trasz_victim7 on 2008/11/19 18:08:02

	New ZFS seems to put garbage into ae_id entry when its contens don't
	matter, i.e. with USER_OBJ, GROUP_OBJ and EVERYONE ACEs, which results
	in acl_is_trivial_np returning false negatives.  Fix this by being more
	strict in conversion from ace_t to acl_t.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#4 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#4 (text+ko) ====

@@ -155,8 +155,6 @@
 		entry = &(aclp->acl_entry[i]);
 		ace = &(aces[i]);
 
-		entry->ae_id = ace->a_who;
-
 		if (ace->a_flags & ACE_OWNER)
 			entry->ae_tag = ACL_USER_OBJ;
 		else if (ace->a_flags & ACE_GROUP)
@@ -168,6 +166,11 @@
 		else
 			entry->ae_tag = ACL_USER;
 
+		if (entry->ae_tag == ACL_USER || entry->ae_tag == ACL_GROUP)
+			entry->ae_id = ace->a_who;
+		else
+			entry->ae_id = ACL_UNDEFINED_ID;
+
 		_bsd_from_sun(&(entry->ae_perm), ace->a_access_mask, perms);
 		_bsd_from_sun(&(entry->ae_flags), ace->a_flags, flags);