From owner-svn-src-head@freebsd.org  Fri Jul 28 18:46:04 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D641DCC1E9;
 Fri, 28 Jul 2017 18:46:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0CD116C21C;
 Fri, 28 Jul 2017 18:46:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6SIk3er014409;
 Fri, 28 Jul 2017 18:46:03 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6SIk3xr014408;
 Fri, 28 Jul 2017 18:46:03 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201707281846.v6SIk3xr014408@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 28 Jul 2017 18:46:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321661 - head/release/tools
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/release/tools
X-SVN-Commit-Revision: 321661
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jul 2017 18:46:04 -0000

Author: gjb
Date: Fri Jul 28 18:46:02 2017
New Revision: 321661
URL: https://svnweb.freebsd.org/changeset/base/321661

Log:
  Revert r321659, re-enabling ChallengeResponseAuthentication, which was
  discussed a while back between cperciva@ and so@, and I forgot.
  
  Reported by:	cperciva
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/ec2.conf

Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf	Fri Jul 28 18:35:29 2017	(r321660)
+++ head/release/tools/ec2.conf	Fri Jul 28 18:46:02 2017	(r321661)
@@ -81,12 +81,6 @@ vm_extra_pre_umount() {
 	# Load the kernel module for the Amazon "Elastic Network Adapter"
 	echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf
 
-	# Disable ChallengeResponseAuthentication according to EC2
-	# requirements.
-	sed -i '' -e \
-		's/^#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication no/' \
-		${DESTDIR}/etc/ssh/sshd_config
-
 	# The first time the AMI boots, the installed "first boot" scripts
 	# should be allowed to run:
 	# * ec2_configinit (download and process EC2 user-data)