From owner-p4-projects@FreeBSD.ORG  Wed Aug 13 13:00:18 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55E601065671; Wed, 13 Aug 2008 13:00:18 +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 18E37106564A
	for <perforce@freebsd.org>; Wed, 13 Aug 2008 13:00:18 +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 0F9768FC1E
	for <perforce@freebsd.org>; Wed, 13 Aug 2008 13:00:18 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7DD0Hxm039638
	for <perforce@freebsd.org>; Wed, 13 Aug 2008 13:00:17 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7DD0HD6039636
	for perforce@freebsd.org; Wed, 13 Aug 2008 13:00:17 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 13 Aug 2008 13:00:17 GMT
Message-Id: <200808131300.m7DD0HD6039636@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 147293 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, 13 Aug 2008 13:00:18 -0000

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

Change 147293 by trasz@trasz_traszkan on 2008/08/13 12:59:43

	Small tweaks.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#8 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#6 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#8 (text+ko) ====

@@ -313,7 +313,8 @@
 		if (acl_type == ACL_TYPE_NFS4)
 			need_mask = 0;
 
-		if (need_mask && (set_acl_mask(&final_acl, filename) == -1)) {
+		if (need_mask && (set_acl_mask(&final_acl,
+		    file->filename) == -1)) {
 			warnx("%s: failed to set ACL mask", file->filename);
 			carried_error++;
 		} else if (h_flag) {

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#6 (text+ko) ====

@@ -155,9 +155,6 @@
 
 	acl_int = &acl->ats_acl;
 
-	/* XXX: */
-	assert(_entry_brand(&(acl->ats_acl.acl_entry[3])) == ACL_BRAND_POSIX);
-
 	qsort(&acl_int->acl_entry[0], acl_int->acl_cnt,
 	    sizeof(struct acl_entry), (compare) _posix1e_acl_entry_compare);