svn commit: r248465 - head/crypto/openssh

[Dag-Erling Smørgrav]

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