From owner-svn-src-all@FreeBSD.ORG  Fri Mar  4 17:23:10 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF474106566B;
	Fri,  4 Mar 2011 17:23:10 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DC6EB8FC15;
	Fri,  4 Mar 2011 17:23:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p24HNAxE043707;
	Fri, 4 Mar 2011 17:23:10 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p24HNAAU043705;
	Fri, 4 Mar 2011 17:23:10 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201103041723.p24HNAAU043705@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 4 Mar 2011 17:23:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219268 - head/lib/libc/posix1e
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Mar 2011 17:23:11 -0000

Author: trasz
Date: Fri Mar  4 17:23:10 2011
New Revision: 219268
URL: http://svn.freebsd.org/changeset/base/219268

Log:
  Make acl_strip_np(3) use new trivial ACL format for NFSv4 ACls (three
  entries instead of six).  This makes "setfacl -b" do the right thing
  for ACLs on ZFS.  UFS recognizes both kinds of trivial ACLs; no change
  there.
  
  MFC after:	2 months

Modified:
  head/lib/libc/posix1e/acl_strip.c

Modified: head/lib/libc/posix1e/acl_strip.c
==============================================================================
--- head/lib/libc/posix1e/acl_strip.c	Fri Mar  4 17:10:39 2011	(r219267)
+++ head/lib/libc/posix1e/acl_strip.c	Fri Mar  4 17:23:10 2011	(r219268)
@@ -141,7 +141,7 @@ acl_strip_np(const acl_t aclp, int recal
 {
 	switch (_acl_brand(aclp)) {
 	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_strip_np(aclp, 1));
+		return (_nfs4_acl_strip_np(aclp, 0));
 
 	case ACL_BRAND_POSIX:
 		return (_posix1e_acl_strip_np(aclp, recalculate_mask));