nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge reconfig fixes from branch 'pre-0.64'.

Browse Source
This commit is contained in:
Jacob Nevins
2014-11-09 00:12:51 +00:00
parent 8ab1433caa f662ff790c
commit 0ab2e03ef2
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssh.c
View File

@ -11321,13 +11321,19 @@ static int ssh_return_exitcode(void *handle)
}
/*
* cfg_info for SSH is the currently running version of the
* protocol. (1 for 1; 2 for 2; 0 for not-decided-yet.)
* cfg_info for SSH is the protocol running in this session.
* (1 or 2 for the full SSH-1 or SSH-2 protocol; -1 for the bare
* SSH-2 connection protocol, i.e. a downstream; 0 for not-decided-yet.)
*/
static int ssh_cfg_info(void *handle)
{
Ssh ssh = (Ssh) handle;
return ssh->version;
if (ssh->version == 0)
return 0; /* don't know yet */
else if (ssh->bare_connection)
return -1;
else
return ssh->version;
}
/*