From owner-p4-projects@FreeBSD.ORG  Wed Aug  6 08:27:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 334741065673; Wed,  6 Aug 2008 08:27:13 +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 EC1DF1065670
	for <perforce@freebsd.org>; Wed,  6 Aug 2008 08:27:12 +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 DA4208FC24
	for <perforce@freebsd.org>; Wed,  6 Aug 2008 08:27:12 +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 m768RCXT084439
	for <perforce@freebsd.org>; Wed, 6 Aug 2008 08:27:12 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m768RCKl084437
	for perforce@freebsd.org; Wed, 6 Aug 2008 08:27:12 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 6 Aug 2008 08:27:12 GMT
Message-Id: <200808060827.m768RCKl084437@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 146757 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, 06 Aug 2008 08:27:13 -0000

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

Change 146757 by trasz@trasz_traszkan on 2008/08/06 08:26:40

	In mv(1), chmod(2) the new file before setting the ACL, not after.
	With NFS4, chmod could modify the ACL.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#4 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#4 (text+ko) ====

@@ -312,6 +312,9 @@
 			sbp->st_mode &= ~(S_ISUID | S_ISGID);
 		}
 	}
+	if (fchmod(to_fd, sbp->st_mode))
+		warn("%s: set mode (was: 0%03o)", to, oldmode);
+
 	/*
 	 * POSIX 1003.2c states that if _POSIX_ACL_EXTENDED is in effect
 	 * for dest_file, then its ACLs shall reflect the ACLs of the
@@ -320,8 +323,7 @@
 	preserve_fd_acls(from_fd, to_fd, from, to);
 
 	(void)close(from_fd);
-	if (fchmod(to_fd, sbp->st_mode))
-		warn("%s: set mode (was: 0%03o)", to, oldmode);
+
 	/*
 	 * XXX
 	 * NFS doesn't support chflags; ignore errors unless there's reason