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>2015-11-29 17:26:12 +0000
commit89dd60ab74e7ebfe4f234c4068fa941479535d8e (patch)
tree4bb4eb6a383d9ee5f73d0b526ede32e6b7ee6fdf /servconf.c
parent10dec1266aa5cf1ad906b1bef6f67edc322c00cb (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 cfe7029e6..ed3a88d4b 100644
--- a/servconf.c
+++ b/servconf.c
@@ -522,6 +522,7 @@ static struct {
522 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, 522 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
523 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, 523 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
524 { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, 524 { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
525 { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL },
525 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, 526 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
526 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, 527 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
527 { "uselogin", sUseLogin, SSHCFG_GLOBAL }, 528 { "uselogin", sUseLogin, SSHCFG_GLOBAL },