diff options
| author |   djm <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
| commit | 67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d (patch) | |
| tree | 8092cdbbddcde08ee62518f1db74e4b13c5be4f6 /usr.bin/ssh/readconf.c | |
| parent | Make early attrbute work here as well. Remove unreachable panic while there. (diff) | |
| download | wireguard-openbsd-67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d.tar.xz wireguard-openbsd-67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d.zip | |
unifdef WITH_SSH1
ok markus@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index e66f2e820bd..7bf65ad6e19 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.271 2017/04/28 03:20:27 dtucker Exp $ */ +/* $OpenBSD: readconf.c,v 1.272 2017/04/30 23:10:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -193,15 +193,9 @@ static struct { { "smartcarddevice", oUnsupported }, { "pkcs11provider", oUnsupported }, #endif -#ifdef WITH_SSH1 - { "rsaauthentication", oRSAAuthentication }, - { "rhostsrsaauthentication", oRhostsRSAAuthentication }, - { "compressionlevel", oCompressionLevel }, -# else { "rsaauthentication", oUnsupported }, { "rhostsrsaauthentication", oUnsupported }, { "compressionlevel", oUnsupported }, -#endif { "forwardagent", oForwardAgent }, { "forwardx11", oForwardX11 }, @@ -2558,9 +2552,6 @@ dump_client_config(Options *o, const char *host) /* Integer options */ dump_cfg_int(oCanonicalizeMaxDots, o->canonicalize_max_dots); -#ifdef WITH_SSH1 - dump_cfg_int(oCompressionLevel, o->compression_level); -#endif dump_cfg_int(oConnectionAttempts, o->connection_attempts); dump_cfg_int(oForwardX11Timeout, o->forward_x11_timeout); dump_cfg_int(oNumberOfPasswordPrompts, o->number_of_password_prompts); |