src/usr.bin/ssh/readconf.c - diff

Return to readconf.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.239, 2015/07/30 00:01:34

version 1.240, 2015/08/21 23:53:08

Line 2229

int i;

char vbuf[5];

/* This is normally prepared in ssh_kex2 */

if (kex_assemble_names(KEX_DEFAULT_PK_ALG, &o->hostkeyalgorithms) != 0)

fatal("%s: kex_assemble_names failed", __func__);

/* Most interesting options first: user, host, port */

dump_cfg_string(oUser, o->user);

dump_cfg_string(oHostName, host);

Line 2289

Line 2293

dump_cfg_string(oBindAddress, o->bind_address);

dump_cfg_string(oCiphers, o->ciphers ? o->ciphers : KEX_CLIENT_ENCRYPT);

dump_cfg_string(oControlPath, o->control_path);

dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms ? o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);

dump_cfg_string(oHostKeyAlgorithms, o->hostkeyalgorithms);

dump_cfg_string(oHostKeyAlias, o->host_key_alias);

dump_cfg_string(oHostbasedKeyTypes, o->hostbased_key_types);

dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);