From owner-svn-src-head@FreeBSD.ORG  Sat Mar  1 03:36:47 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3397DD17;
 Sat,  1 Mar 2014 03:36:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1FB991A1F;
 Sat,  1 Mar 2014 03:36:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s213akRr042621;
 Sat, 1 Mar 2014 03:36:46 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s213akr5042620;
 Sat, 1 Mar 2014 03:36:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201403010336.s213akr5042620@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 1 Mar 2014 03:36:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262647 - head/usr.bin/ssh-copy-id
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.17
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: Sat, 01 Mar 2014 03:36:47 -0000

Author: eadler
Date: Sat Mar  1 03:36:46 2014
New Revision: 262647
URL: http://svnweb.freebsd.org/changeset/base/262647

Log:
  ssh-copy-id: add restorecon call
  
  In certain situations when creating an authorized_key file on a Linux machine
  restorecon(1) may need to be called.  Therefore, attempt to run it if it exists.
  
  MFC After:	1 week
  Idea from:	https://bugzilla.redhat.com/show_bug.cgi?id=739989

Modified:
  head/usr.bin/ssh-copy-id/ssh-copy-id.sh

Modified: head/usr.bin/ssh-copy-id/ssh-copy-id.sh
==============================================================================
--- head/usr.bin/ssh-copy-id/ssh-copy-id.sh	Sat Mar  1 03:17:58 2014	(r262646)
+++ head/usr.bin/ssh-copy-id/ssh-copy-id.sh	Sat Mar  1 03:36:46 2014	(r262647)
@@ -46,6 +46,9 @@ sendkey() {
 				printf "$alg $key $comment\n" >> "$keyfile" ; \
 			fi ; \
 		done \
+		if [ -x /sbin/restorecon ]; then \
+			/sbin/restorecon -F "$HOME/.ssh/" "$keyfile" >/dev/null 2>&1 || true ; \
+		fi
 	'\' 
 }