summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-03-05 02:02:11 +0000
committerColin Watson <cjwatson@debian.org>2018-04-03 18:40:49 +0100
commit1e4b9d8e6cee1e15edfc12aa0294fa78639496b9 (patch)
treeb14bd86595a8f4544b4a4a41d521a0141c1d235b
parente8e09061f8168f6f105f56fca10b6cd61b9f587a (diff)
Restore reading authorized_keys2 by default
Upstream seems to intend to gradually phase this out, so don't assume that this will remain the default forever. However, we were late in adopting the upstream sshd_config changes, so it makes sense to extend the grace period. Bug-Debian: https://bugs.debian.org/852320 Forwarded: not-needed Last-Update: 2017-03-05 Patch-Name: restore-authorized_keys2.patch
-rw-r--r--sshd_config5
1 files changed, 2 insertions, 3 deletions
diff --git a/sshd_config b/sshd_config
index de9cc9fe2..31e14a4f0 100644
--- a/sshd_config
+++ b/sshd_config
@@ -36,9 +36,8 @@
36 36
37#PubkeyAuthentication yes 37#PubkeyAuthentication yes
38 38
39# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 39# Expect .ssh/authorized_keys2 to be disregarded by default in future.
40# but this is overridden so installations will only check .ssh/authorized_keys 40#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2
41AuthorizedKeysFile .ssh/authorized_keys
42 41
43#AuthorizedPrincipalsFile none 42#AuthorizedPrincipalsFile none
44 43