summaryrefslogtreecommitdiffstats
path: root/debian/patches/ssh-vulnkey-compat.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 07:43:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 07:43:01 +0000
commitd7a73a8b8b4072c85837049c8eaae6f1d23c5f7c (patch)
tree4f2b90acc13aa39caae7a94f66075726a1d4cb8c /debian/patches/ssh-vulnkey-compat.patch
parentMerging upstream version 1:9.8p1. (diff)
downloadopenssh-d7a73a8b8b4072c85837049c8eaae6f1d23c5f7c.tar.xz
openssh-d7a73a8b8b4072c85837049c8eaae6f1d23c5f7c.zip
Adding debian version 1:9.8p1-1.debian/1%9.8p1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/ssh-vulnkey-compat.patch')
-rw-r--r--debian/patches/ssh-vulnkey-compat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/ssh-vulnkey-compat.patch b/debian/patches/ssh-vulnkey-compat.patch
index f517596..d0c82ea 100644
--- a/debian/patches/ssh-vulnkey-compat.patch
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -1,4 +1,4 @@
-From 2d6d05de518be9a3b3724a951e9dcb57e4c6124e Mon Sep 17 00:00:00 2001
+From 996f025eb2f6521e3fb4a7b527ec4eaceebe8156 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 9 Feb 2014 16:09:50 +0000
Subject: Accept obsolete ssh-vulnkey configuration options
@@ -17,7 +17,7 @@ Patch-Name: ssh-vulnkey-compat.patch
2 files changed, 2 insertions(+)
diff --git a/readconf.c b/readconf.c
-index 91d3c0aa0..0f0fb67a5 100644
+index 8bdeb9d08..cd1ebc85d 100644
--- a/readconf.c
+++ b/readconf.c
@@ -197,6 +197,7 @@ static struct {
@@ -29,10 +29,10 @@ index 91d3c0aa0..0f0fb67a5 100644
{ "useroaming", oDeprecated },
{ "usersh", oDeprecated },
diff --git a/servconf.c b/servconf.c
-index 961cf9e45..193d73cca 100644
+index c1bfca258..169b9ff07 100644
--- a/servconf.c
+++ b/servconf.c
-@@ -649,6 +649,7 @@ static struct {
+@@ -692,6 +692,7 @@ static struct {
{ "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
{ "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
{ "strictmodes", sStrictModes, SSHCFG_GLOBAL },