From owner-p4-projects@FreeBSD.ORG  Tue Mar 31 17:30:32 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12143106566B; Tue, 31 Mar 2009 17:30:32 +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 B5CD51065676
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 17:30:31 +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 A30358FC1C
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 17:30:31 +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 n2VHUV3p041770
	for <perforce@freebsd.org>; Tue, 31 Mar 2009 17:30:31 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2VHUVEk041768
	for perforce@freebsd.org; Tue, 31 Mar 2009 17:30:31 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 31 Mar 2009 17:30:31 GMT
Message-Id: <200903311730.n2VHUVEk041768@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 160063 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: Tue, 31 Mar 2009 17:30:33 -0000

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

Change 160063 by trasz@trasz_victim7 on 2009/03/31 17:29:33

	Fix build even more.

Affected files ...

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

Differences ...

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

@@ -142,7 +142,7 @@
 int
 acl_from_aces(struct acl *aclp, const ace_t *aces, int nentries)
 {
-	int i;
+	int i, tmpflags = 0;
 	struct acl_entry *entry;
 	const ace_t *ace;
 
@@ -172,7 +172,8 @@
 			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);
+		_bsd_from_sun(&tmpflags, ace->a_flags, flags);
+		entry->ae_flags = tmpflags;
 
 		switch (ace->a_type) {
 		case ACE_ACCESS_ALLOWED_ACE_TYPE: