summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@ubuntu.com>2014-02-09 16:09:50 +0000
committerColin Watson <cjwatson@debian.org>2016-12-28 20:05:05 +0000
commit8bdb2e6f613ad62c3aa781ba6cb7088ee16a6dfd (patch)
treec201f074b004c2c13e5f065013caf411500259ff /servconf.c
parentef3ee35a1061c563f2c32ab13f77324b6372e8be (diff)
Accept obsolete ssh-vulnkey configuration options
These options were used as part of Debian's response to CVE-2008-0166. Nearly six years later, we no longer need to continue carrying the bulk of that patch, but we do need to avoid failing when the associated configuration options are still present. Last-Update: 2014-02-09 Patch-Name: ssh-vulnkey-compat.patch
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/servconf.c b/servconf.c
index 14c81fa92..49d3bdc8c 100644
--- a/servconf.c
+++ b/servconf.c
@@ -521,6 +521,7 @@ static struct {
521 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, 521 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
522 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, 522 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
523 { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, 523 { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
524 { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL },
524 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, 525 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
525 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, 526 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
526 { "uselogin", sDeprecated, SSHCFG_GLOBAL }, 527 { "uselogin", sDeprecated, SSHCFG_GLOBAL },