From owner-svn-src-head@FreeBSD.ORG  Thu Jan 31 16:04:40 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E9145BD1;
 Thu, 31 Jan 2013 16:04:40 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D7142C;
 Thu, 31 Jan 2013 16:04:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VG4eJj034330;
 Thu, 31 Jan 2013 16:04:40 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VG4e1c034329;
 Thu, 31 Jan 2013 16:04:40 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301311604.r0VG4e1c034329@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 31 Jan 2013 16:04:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246147 - head/usr.bin/xinstall
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jan 2013 16:04:41 -0000

Author: brooks
Date: Thu Jan 31 16:04:40 2013
New Revision: 246147
URL: http://svnweb.freebsd.org/changeset/base/246147

Log:
  When in -U mode do avoid setting SUID bits, but do not modify the mode
  variable so the intended mode can be logged correctly if -M is specified.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/usr.bin/xinstall/xinstall.c

Modified: head/usr.bin/xinstall/xinstall.c
==============================================================================
--- head/usr.bin/xinstall/xinstall.c	Thu Jan 31 14:07:24 2013	(r246146)
+++ head/usr.bin/xinstall/xinstall.c	Thu Jan 31 16:04:40 2013	(r246147)
@@ -953,9 +953,8 @@ install(const char *from_name, const cha
 		}
 
 	if (mode != (to_sb.st_mode & ALLPERMS)) {
-		if (dounpriv)
-			mode &= S_IRWXU|S_IRWXG|S_IRWXO;
-		if (fchmod(to_fd, mode)) {
+		if (fchmod(to_fd,
+		     dounpriv ? mode & (S_IRWXU|S_IRWXG|S_IRWXO) : mode)) {
 			serrno = errno;
 			(void)unlink(to_name);
 			errno = serrno;