diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-27 15:37:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-27 15:37:48 +0000 |
| commit | aeca9fa80cbdf6e85f15e0c676b70f76c7ae6037 (patch) | |
| tree | b889aadf63dfccb335fb48b65c98fa8bbc099ff1 /tools/plink/ssh.c | |
| parent | dc9d750132f95783d2db6fb8e08271fc0878576d (diff) | |
| download | vcxsrv-aeca9fa80cbdf6e85f15e0c676b70f76c7ae6037.tar.gz vcxsrv-aeca9fa80cbdf6e85f15e0c676b70f76c7ae6037.tar.bz2 vcxsrv-aeca9fa80cbdf6e85f15e0c676b70f76c7ae6037.zip | |
plink: updated to putty revision 9080
Diffstat (limited to 'tools/plink/ssh.c')
| -rw-r--r-- | tools/plink/ssh.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/plink/ssh.c b/tools/plink/ssh.c index 7c9b929de..0982f84a4 100644 --- a/tools/plink/ssh.c +++ b/tools/plink/ssh.c @@ -2862,6 +2862,7 @@ static int ssh_do_close(Ssh ssh, int notify_exit) x11_close(c->u.x11.s);
break;
case CHAN_SOCKDATA:
+ case CHAN_SOCKDATA_DORMANT:
pfd_close(c->u.pfd.s);
break;
}
@@ -7194,12 +7195,14 @@ static void ssh2_msg_channel_open(Ssh ssh, struct Packet *pktin) }
/*
- * Buffer banner messages for later display at some convenient point.
+ * Buffer banner messages for later display at some convenient point,
+ * if we're going to display them.
*/
static void ssh2_msg_userauth_banner(Ssh ssh, struct Packet *pktin)
{
/* Arbitrary limit to prevent unbounded inflation of buffer */
- if (bufchain_size(&ssh->banner) <= 131072) {
+ if (ssh->cfg.ssh_show_banner &&
+ bufchain_size(&ssh->banner) <= 131072) {
char *banner = NULL;
int size = 0;
ssh_pkt_getstring(pktin, &banner, &size);
@@ -9355,6 +9358,7 @@ static void ssh_free(void *handle) x11_close(c->u.x11.s);
break;
case CHAN_SOCKDATA:
+ case CHAN_SOCKDATA_DORMANT:
if (c->u.pfd.s != NULL)
pfd_close(c->u.pfd.s);
break;
|