diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:50 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-09 23:43:32 +0000 |
commit | bdc94de85ed7dbafb949c239d7c3eff23ea4aa28 (patch) | |
tree | 716f5d6a80b6cc7baf4f2313e211ec323e64d6ac /servconf.c | |
parent | 07f2a771c490bd68cd5c5ea9c535705e93bd94f3 (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/servconf.c b/servconf.c index c938ae399..dcb8cafdc 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -451,6 +451,7 @@ static struct { | |||
451 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | 451 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, |
452 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | 452 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, |
453 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | 453 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, |
454 | { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
454 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | 455 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, |
455 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | 456 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, |
456 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, | 457 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, |