diff options
-rw-r--r-- | readconf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index 1d03bdf72..354e292d3 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.239 2015/07/30 00:01:34 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.240 2015/08/21 23:53:08 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2243,6 +2243,10 @@ dump_client_config(Options *o, const char *host) | |||
2243 | int i; | 2243 | int i; |
2244 | char vbuf[5]; | 2244 | char vbuf[5]; |
2245 | 2245 | ||
2246 | /* This is normally prepared in ssh_kex2 */ | ||
2247 | if (kex_assemble_names(KEX_DEFAULT_PK_ALG, &o->hostkeyalgorithms) != 0) | ||
2248 | fatal("%s: kex_assemble_names failed", __func__); | ||
2249 | |||
2246 | /* Most interesting options first: user, host, port */ | 2250 | /* Most interesting options first: user, host, port */ |
2247 | dump_cfg_string(oUser, o->user); | 2251 | dump_cfg_string(oUser, o->user); |
2248 | dump_cfg_string(oHostName, host); | 2252 | dump_cfg_string(oHostName, host); |
@@ -2303,7 +2307,7 @@ dump_client_config(Options *o, const char *host) | |||
2303 | dump_cfg_string(oBindAddress, o->bind_address); | 2307 | dump_cfg_string(oBindAddress, o->bind_address); |
2304 | dump_cfg_string(oCiphers, o->ciphers ? o->ciphers : KEX_CLIENT_ENCRYPT); | 2308 | dump_cfg_string(oCiphers, o->ciphers ? o->ciphers : KEX_CLIENT_ENCRYPT); |
2305 | dump_cfg_string(oControlPath, o->control_path); | 2309 | dump_cfg_string(oControlPath, o->control_path); |
2306 | dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms ? o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG); | 2310 | dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms); |
2307 | dump_cfg_string(oHostKeyAlias, o->host_key_alias); | 2311 | dump_cfg_string(oHostKeyAlias, o->host_key_alias); |
2308 | dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types); | 2312 | dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types); |
2309 | dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices); | 2313 | dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices); |