summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-03-05 17:37:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-03-05 17:37:04 +0000
commit332a884613fe279aacec45d0c9a88b998e039705 (patch)
tree276285e1bdbc2f9cd33f75d1b81fbfb53404baf3
parentMerging debian version 1:7.4p1-7. (diff)
downloadopenssh-332a884613fe279aacec45d0c9a88b998e039705.zip
openssh-332a884613fe279aacec45d0c9a88b998e039705.tar.xz
Refreshing sshd-config-pubkeyacceptedkeytypes.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/progress-linux/0025-sshd-config-pubkeyacceptedkeytypes.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/progress-linux/0025-sshd-config-pubkeyacceptedkeytypes.patch b/debian/patches/progress-linux/0025-sshd-config-pubkeyacceptedkeytypes.patch
index 4815081..091b786 100644
--- a/debian/patches/progress-linux/0025-sshd-config-pubkeyacceptedkeytypes.patch
+++ b/debian/patches/progress-linux/0025-sshd-config-pubkeyacceptedkeytypes.patch
@@ -10,5 +10,5 @@ diff -Naurp openssh.orig/sshd_config openssh/sshd_config
#PubkeyAuthentication yes
+PubkeyAcceptedKeyTypes ssh-rsa-cert-v01@openssh.com,ssh-rsa
- # 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
+ # Expect .ssh/authorized_keys2 to be disregarded by default in future.
+ #AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2