From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 15:27:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D5BF106567A; Tue, 11 Nov 2008 15:27: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 00E171065673
	for <perforce@freebsd.org>; Tue, 11 Nov 2008 15:27:40 +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 E4B438FC19
	for <perforce@freebsd.org>; Tue, 11 Nov 2008 15:27: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 mABFRdpS083304
	for <perforce@freebsd.org>; Tue, 11 Nov 2008 15:27:39 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mABFRdtb083302
	for perforce@freebsd.org; Tue, 11 Nov 2008 15:27:39 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 11 Nov 2008 15:27:39 GMT
Message-Id: <200811111527.mABFRdtb083302@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 152808 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, 11 Nov 2008 15:27:40 -0000

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

Change 152808 by trasz@trasz_victim7 on 2008/11/11 15:27:05

	Fix regression tests after recent change on rename(2) semantics
	when moving directories.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#2 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#2 (text+ko) ====

@@ -24,7 +24,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Moving directory elsewhere allowed on writable directory.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 prependacl . user:65534:write_data::deny
 expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 expect 0 prependacl . user:65534:write_data::allow
@@ -40,7 +40,7 @@
 # Moving directory from elsewhere overwriting local directory allowed
 # on writable directory.
 expect 0 mkdir ${n0} 0755
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 expect 0 prependacl . user:65534:write_data::deny
 expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
 expect 0 prependacl . user:65534:write_data::allow
@@ -54,7 +54,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Denied DELETE changes nothing wrt moving elsewhere or from elsewhere.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
 expect 0 -u 65534 -g 65534 rmdir ${n0}
@@ -67,7 +67,7 @@
 
 # 35
 # DELETE_CHILD denies moving directory elsewhere.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 expect 0 rename ${n0} ../${n3}/${n0}
 
@@ -86,7 +86,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Same for moving the directory elsewhere.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 prependacl ${n0} user:65534:delete::allow
 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 
@@ -99,7 +99,7 @@
 # DELETE does not allow for overwriting a directory in a unwritable
 # directory with DELETE_CHILD denied.
 expect 0 mkdir ${n0} 0755
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 expect 0 prependacl . user:65534:write_data::deny
 expect 0 prependacl . user:65534:delete_child::deny
 expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
@@ -118,7 +118,7 @@
 expect 0 -u 65534 -g 65534 rmdir ${n0}
 
 # Moving things elsewhere is allowed.
-expect 0 mkdir ${n0} 0755
+expect 0 mkdir ${n0} 0777
 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0}
 
 # 60
@@ -128,10 +128,10 @@
 
 # Even if we're overwriting.
 # XXX: expect 0 mkdir ${n0} 0755
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 # XXX: expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
 expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
-expect 0 mkdir ../${n3}/${n0} 0755
+expect 0 mkdir ../${n3}/${n0} 0777
 
 # Even if we have DELETE on the existing directory.
 expect 0 prependacl ${n0} user:65534:delete::allow