From owner-svn-src-releng@FreeBSD.ORG  Thu Mar 28 13:45:46 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E3BFCE84;
 Thu, 28 Mar 2013 13:45:46 +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 D6595894;
 Thu, 28 Mar 2013 13:45:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SDjkEE058003;
 Thu, 28 Mar 2013 13:45:46 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SDjkBb058002;
 Thu, 28 Mar 2013 13:45:46 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201303281345.r2SDjkBb058002@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Thu, 28 Mar 2013 13:45:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r248829 - releng/8.4/crypto/openssh
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2013 13:45:47 -0000

Author: des
Date: Thu Mar 28 13:45:45 2013
New Revision: 248829
URL: http://svnweb.freebsd.org/changeset/base/248829

Log:
  MFH (r248465): revert upstream decommissioning of authorized_keys2
  
  Approved by:	re (marius@)

Modified:
  releng/8.4/crypto/openssh/sshd_config
Directory Properties:
  releng/8.4/crypto/openssh/   (props changed)

Modified: releng/8.4/crypto/openssh/sshd_config
==============================================================================
--- releng/8.4/crypto/openssh/sshd_config	Thu Mar 28 13:38:02 2013	(r248828)
+++ releng/8.4/crypto/openssh/sshd_config	Thu Mar 28 13:45:45 2013	(r248829)
@@ -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