diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-08-25 23:57:54 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-08-29 11:20:28 +1000 |
commit | ae363d74ccc1451185c0c8bd4631e28c67c7fd36 (patch) | |
tree | fe3d0b2329ad8628dcfee555fb37282061270edc /servconf.c | |
parent | a94c60306643ae904add6e8ed219e4be3494255c (diff) |
upstream commit
add a sIgnore opcode that silently ignores options and
use it to suppress noisy deprecation warnings for the Protocol directive.
req henning, ok markus
Upstream-ID: 9fe040aca3d6ff393f6f7e60045cdd821dc4cbe0
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/servconf.c b/servconf.c index 8a4a7091a..acd903a88 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.294 2016/08/19 03:18:06 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.295 2016/08/25 23:57:54 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -415,7 +415,7 @@ typedef enum { | |||
415 | sAuthenticationMethods, sHostKeyAgent, sPermitUserRC, | 415 | sAuthenticationMethods, sHostKeyAgent, sPermitUserRC, |
416 | sStreamLocalBindMask, sStreamLocalBindUnlink, | 416 | sStreamLocalBindMask, sStreamLocalBindUnlink, |
417 | sAllowStreamLocalForwarding, sFingerprintHash, | 417 | sAllowStreamLocalForwarding, sFingerprintHash, |
418 | sDeprecated, sUnsupported | 418 | sDeprecated, sIgnore, sUnsupported |
419 | } ServerOpCodes; | 419 | } ServerOpCodes; |
420 | 420 | ||
421 | #define SSHCFG_GLOBAL 0x01 /* allowed in main section of sshd_config */ | 421 | #define SSHCFG_GLOBAL 0x01 /* allowed in main section of sshd_config */ |
@@ -518,7 +518,7 @@ static struct { | |||
518 | { "denygroups", sDenyGroups, SSHCFG_ALL }, | 518 | { "denygroups", sDenyGroups, SSHCFG_ALL }, |
519 | { "ciphers", sCiphers, SSHCFG_GLOBAL }, | 519 | { "ciphers", sCiphers, SSHCFG_GLOBAL }, |
520 | { "macs", sMacs, SSHCFG_GLOBAL }, | 520 | { "macs", sMacs, SSHCFG_GLOBAL }, |
521 | { "protocol", sDeprecated, SSHCFG_GLOBAL }, | 521 | { "protocol", sIgnore, SSHCFG_GLOBAL }, |
522 | { "gatewayports", sGatewayPorts, SSHCFG_ALL }, | 522 | { "gatewayports", sGatewayPorts, SSHCFG_ALL }, |
523 | { "subsystem", sSubsystem, SSHCFG_GLOBAL }, | 523 | { "subsystem", sSubsystem, SSHCFG_GLOBAL }, |
524 | { "maxstartups", sMaxStartups, SSHCFG_GLOBAL }, | 524 | { "maxstartups", sMaxStartups, SSHCFG_GLOBAL }, |
@@ -719,7 +719,7 @@ get_connection_info(int populate, int use_dns) | |||
719 | * options set are copied into the main server config. | 719 | * options set are copied into the main server config. |
720 | * | 720 | * |
721 | * Potential additions/improvements: | 721 | * Potential additions/improvements: |
722 | * - Add Match support for pre-kex directives, eg Protocol, Ciphers. | 722 | * - Add Match support for pre-kex directives, eg. Ciphers. |
723 | * | 723 | * |
724 | * - Add a Tag directive (idea from David Leonard) ala pf, eg: | 724 | * - Add a Tag directive (idea from David Leonard) ala pf, eg: |
725 | * Match Address 192.168.0.* | 725 | * Match Address 192.168.0.* |
@@ -1824,15 +1824,12 @@ process_server_config_line(ServerOptions *options, char *line, | |||
1824 | break; | 1824 | break; |
1825 | 1825 | ||
1826 | case sDeprecated: | 1826 | case sDeprecated: |
1827 | logit("%s line %d: Deprecated option %s", | 1827 | case sIgnore: |
1828 | filename, linenum, arg); | ||
1829 | while (arg) | ||
1830 | arg = strdelim(&cp); | ||
1831 | break; | ||
1832 | |||
1833 | case sUnsupported: | 1828 | case sUnsupported: |
1834 | logit("%s line %d: Unsupported option %s", | 1829 | do_log2(opcode == sIgnore ? |
1835 | filename, linenum, arg); | 1830 | SYSLOG_LEVEL_DEBUG2 : SYSLOG_LEVEL_INFO, |
1831 | "%s line %d: %s option %s", filename, linenum, | ||
1832 | opcode == sUnsupported ? "Unsupported" : "Deprecated", arg); | ||
1836 | while (arg) | 1833 | while (arg) |
1837 | arg = strdelim(&cp); | 1834 | arg = strdelim(&cp); |
1838 | break; | 1835 | break; |