From owner-p4-projects@FreeBSD.ORG  Wed Apr 29 16:17:40 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B5121065696; Wed, 29 Apr 2009 16:17:40 +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 861951065678
	for <perforce@freebsd.org>; Wed, 29 Apr 2009 16:17:39 +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 738F98FC1B
	for <perforce@freebsd.org>; Wed, 29 Apr 2009 16:17:39 +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 n3TGHdEw010320
	for <perforce@freebsd.org>; Wed, 29 Apr 2009 16:17:39 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3TGHdRx010318
	for perforce@freebsd.org; Wed, 29 Apr 2009 16:17:39 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 29 Apr 2009 16:17:39 GMT
Message-Id: <200904291617.n3TGHdRx010318@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 161330 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, 29 Apr 2009 16:17:40 -0000

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

Change 161330 by trasz@trasz_victim on 2009/04/29 16:16:55

	Fix mismerge.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#7 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#7 (text+ko) ====

@@ -90,6 +90,26 @@
 # Test removing entries.
 $ setfacl -x user:42: xxx
 $ getfacl xxx
+> # file: xxx
+> # owner: root
+> # group: wheel
+> user::rw-
+> group::r--
+> group:43:-w-
+> mask::rw-
+> other::r--
+
+$ setfacl -m u:42:r xxx
+$ getfacl -n xxx
+> # file: xxx
+> # owner: root
+> # group: wheel
+> user::rw-
+> user:42:r--
+> group::r--
+> group:43:-w-
+> mask::rw-
+> other::r--
 
 # Test removing entries by number.
 $ setfacl -x 1 xxx
@@ -223,7 +243,7 @@
 > -rw-r--r--+
 
 $ setfacl -bn nnn xxx yyy zzz
-> setfacl: stat() of nnn failed: No such file or directory
+> setfacl: nnn: acl_get_file() failed: No such file or directory
 
 $ ls -l nnn xxx yyy zzz | cut -d' ' -f1
 > ls: nnn: No such file or directory