diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2016-08-25 23:57:55 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2016-08-25 23:57:55 +0000 |
| commit | 5e46d6800155758067d9659d4f47eeb8fc7ff600 (patch) | |
| tree | 4240f89830a5f0b3f6e7a5b50f92f15ffae35710 /usr.bin | |
| parent | 794be835e772d0112e7f14662070f1d75d92b870 (diff) | |
add a sIgnore opcode that silently ignores options and use it to
suppress noisy deprecation warnings for the Protocol directive.
req henning, ok markus
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 469f4d2d3df..a1352f3be21 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.294 2016/08/19 03:18:06 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.295 2016/08/25 23:57:54 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -385,7 +385,7 @@ typedef enum { sAuthenticationMethods, sHostKeyAgent, sPermitUserRC, sStreamLocalBindMask, sStreamLocalBindUnlink, sAllowStreamLocalForwarding, sFingerprintHash, - sDeprecated, sUnsupported + sDeprecated, sIgnore, sUnsupported } ServerOpCodes; #define SSHCFG_GLOBAL 0x01 /* allowed in main section of sshd_config */ @@ -472,7 +472,7 @@ static struct { { "denygroups", sDenyGroups, SSHCFG_ALL }, { "ciphers", sCiphers, SSHCFG_GLOBAL }, { "macs", sMacs, SSHCFG_GLOBAL }, - { "protocol", sDeprecated, SSHCFG_GLOBAL }, + { "protocol", sIgnore, SSHCFG_GLOBAL }, { "gatewayports", sGatewayPorts, SSHCFG_ALL }, { "subsystem", sSubsystem, SSHCFG_GLOBAL }, { "maxstartups", sMaxStartups, SSHCFG_GLOBAL }, @@ -673,7 +673,7 @@ get_connection_info(int populate, int use_dns) * options set are copied into the main server config. * * Potential additions/improvements: - * - Add Match support for pre-kex directives, eg Protocol, Ciphers. + * - Add Match support for pre-kex directives, eg. Ciphers. * * - Add a Tag directive (idea from David Leonard) ala pf, eg: * Match Address 192.168.0.* @@ -1772,15 +1772,12 @@ process_server_config_line(ServerOptions *options, char *line, break; case sDeprecated: - logit("%s line %d: Deprecated option %s", - filename, linenum, arg); - while (arg) - arg = strdelim(&cp); - break; - + case sIgnore: case sUnsupported: - logit("%s line %d: Unsupported option %s", - filename, linenum, arg); + do_log2(opcode == sIgnore ? + SYSLOG_LEVEL_DEBUG2 : SYSLOG_LEVEL_INFO, + "%s line %d: %s option %s", filename, linenum, + opcode == sUnsupported ? "Unsupported" : "Deprecated", arg); while (arg) arg = strdelim(&cp); break; |