summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd_config
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/ssh/sshd_config')
-rw-r--r--usr.bin/ssh/sshd_config7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd_config b/usr.bin/ssh/sshd_config
index 7d83b3c84b4..52fd8622fc2 100644
--- a/usr.bin/ssh/sshd_config
+++ b/usr.bin/ssh/sshd_config
@@ -1,4 +1,4 @@
-# $OpenBSD: sshd_config,v 1.83 2011/05/06 01:03:35 dtucker Exp $
+# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
@@ -42,7 +42,10 @@
#RSAAuthentication yes
#PubkeyAuthentication yes
-#AuthorizedKeysFile .ssh/authorized_keys
+
+# 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
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
#RhostsRSAAuthentication no