nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Set cfg.ssh_simple in Windows Plink when there are no forwardings.

Browse Source 
Unix Plink had had this for ages, but for some reason I didn't add it to
Windows Plink at the same time.
This commit is contained in:
Ben Harris 2016-04-15 22:58:26 +01:00
parent 34add87ad2
commit b22c0b6f3e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/uxplink.c
View File

@ -961,7 +961,7 @@ int main(int argc, char **argv)
uxsel_init(); uxsel_init();
/* /*
* Unix Plink doesn't provide any way to add forwardings after the * Plink doesn't provide any way to add forwardings after the
* connection is set up, so if there are none now, we can safely set * connection is set up, so if there are none now, we can safely set
* the "simple" flag. * the "simple" flag.
*/ */

11
windows/winplink.c
View File

@ -618,6 +618,17 @@ int main(int argc, char **argv)
return 1; return 1;
} }
/*
* Plink doesn't provide any way to add forwardings after the
* connection is set up, so if there are none now, we can safely set
* the "simple" flag.
*/
if (conf_get_int(conf, CONF_protocol) == PROT_SSH &&
!conf_get_int(conf, CONF_x11_forward) &&
!conf_get_int(conf, CONF_agentfwd) &&
!conf_get_str_nthstrkey(conf, CONF_portfwd, 0))
conf_set_int(conf, CONF_ssh_simple, TRUE);
logctx = log_init(NULL, conf); logctx = log_init(NULL, conf);
console_provide_logctx(logctx); console_provide_logctx(logctx);