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>2014-02-10 02:40:15 +0000
commit889e217b88a7848e6c997f7f87d07b9d1a35fb49 (patch)
treea705d7273058bf90789ce0d23422b6ec6ef8bc68 /servconf.c
parentcc5ecb35ae6572d13ed523d143439a8559d1fee2 (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 29209e452..65f71ade8 100644
--- a/servconf.c
+++ b/servconf.c
@@ -456,6 +456,7 @@ static struct {
456 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, 456 { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
457 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, 457 { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
458 { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, 458 { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
459 { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL },
459 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, 460 { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
460 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, 461 { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
461 { "uselogin", sUseLogin, SSHCFG_GLOBAL }, 462 { "uselogin", sUseLogin, SSHCFG_GLOBAL },