From owner-svn-src-all@FreeBSD.ORG  Mon Mar 18 10:50:51 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CD309178D;
 Mon, 18 Mar 2013 10:50:51 +0000 (UTC) (envelope-from des@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 C01E472B;
 Mon, 18 Mar 2013 10:50:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IAopJ3004854;
 Mon, 18 Mar 2013 10:50:51 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2IAopIJ004853;
 Mon, 18 Mar 2013 10:50:51 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201303181050.r2IAopIJ004853@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 18 Mar 2013 10:50:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248465 - head/crypto/openssh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Mar 2013 10:50:51 -0000

Author: des
Date: Mon Mar 18 10:50:50 2013
New Revision: 248465
URL: http://svnweb.freebsd.org/changeset/base/248465

Log:
  Keep the default AuthorizedKeysFile setting.  Although authorized_keys2
  has been deprecated for a while, some people still use it and were
  unpleasantly surprised by this change.
  
  I may revert this commit at a later date if I can come up with a way
  to give users who still have authorized_keys2 files sufficient advance
  warning.
  
  MFC after:	ASAP

Modified:
  head/crypto/openssh/sshd_config

Modified: head/crypto/openssh/sshd_config
==============================================================================
--- head/crypto/openssh/sshd_config	Mon Mar 18 09:52:17 2013	(r248464)
+++ head/crypto/openssh/sshd_config	Mon Mar 18 10:50:50 2013	(r248465)
@@ -50,8 +50,7 @@
 #PubkeyAuthentication yes
 
 # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
+#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2
 
 #AuthorizedPrincipalsFile none