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

Return to readconf.c CVS log

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

Diff for /src/usr.bin/ssh/readconf.c between version 1.252 and 1.253

version 1.252, 2016/04/15 00:30:19

version 1.253, 2016/05/04 12:21:53

Line 132

oPasswordAuthentication, oRSAAuthentication,

oChallengeResponseAuthentication, oXAuthLocation,

oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,

oCertificateFile, oAddKeysToAgent,

oCertificateFile, oAddKeysToAgent, oIdentityAgent,

oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,

oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,

oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,

Line 202

{ "identitiesonly", oIdentitiesOnly },

{ "certificatefile", oCertificateFile },

{ "addkeystoagent", oAddKeysToAgent },

{ "identityagent", oIdentityAgent },

{ "hostname", oHostName },

{ "hostkeyalias", oHostKeyAlias },

{ "proxycommand", oProxyCommand },

Line 1621

Line 1622

multistate_ptr = multistate_yesnoaskconfirm;

goto parse_multistate;

case oIdentityAgent:

charptr = &options->identity_agent;

goto parse_string;

case oDeprecated:

debug("%s line %d: Deprecated option \"%s\"",

filename, linenum, keyword);

Line 1799

Line 1804

options->local_command = NULL;

options->permit_local_command = -1;

options->add_keys_to_agent = -1;

options->identity_agent = NULL;

options->visual_host_key = -1;

options->ip_qos_interactive = -1;

options->ip_qos_bulk = -1;

Line 2446

Line 2452

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(oIdentityAgent, o->identity_agent);

dump_cfg_string(oKbdInteractiveDevices, o->kbd_interactive_devices);

dump_cfg_string(oKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : KEX_CLIENT_KEX);

dump_cfg_string(oLocalCommand, o->local_command);