svn commit: r248829 - releng/8.4/crypto/openssh

[Dag-Erling Smørgrav]

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