diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-27 15:53:26 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-27 15:53:26 +0000 |
| commit | 613fdaf384eb16a4d7058dcbfbca9f43e44e063d (patch) | |
| tree | 249f435137654a5fa846d88bf30a731480f3c806 /tools/plink/ssh.c | |
| parent | 11903063211dc368d03f52e090e52ab18ebe3f47 (diff) | |
| parent | 987904f9692c374b81547ebe0bd3bad5a279db48 (diff) | |
| download | vcxsrv-613fdaf384eb16a4d7058dcbfbca9f43e44e063d.tar.gz vcxsrv-613fdaf384eb16a4d7058dcbfbca9f43e44e063d.tar.bz2 vcxsrv-613fdaf384eb16a4d7058dcbfbca9f43e44e063d.zip | |
svn merge ^/branches/released .
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;
|