From 5c646f3270b99a25ff2bef9dd947c8ee347a5aff Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Aug 2001 16:58:47 +0000
Subject: [PATCH] Fix handling of SSH2_MSG_CHANNEL_CLOSE, which was breaking in
 port forwarding talking to ssh.com's ssh-3.0.1.

[originally from svn r1216]
---
 ssh.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/ssh.c b/ssh.c
index 4856e630..efc28ef6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -4729,22 +4729,29 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
 		c = find234(ssh_channels, &i, ssh_channelfind);
 		if (!c)
 		    continue;	       /* nonexistent channel */
-		if (c->closes == 0) {
-		    ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE);
-		    ssh2_pkt_adduint32(c->remoteid);
-		    ssh2_pkt_send();
-		}
 		/* Do pre-close processing on the channel. */
 		switch (c->type) {
 		  case CHAN_MAINSESSION:
 		    break;	       /* nothing to see here, move along */
 		  case CHAN_X11:
+		    if (c->u.x11.s != NULL)
+			x11_close(c->u.x11.s);
+		    sshfwd_close(c);
 		    break;
 		  case CHAN_AGENT:
+		    sshfwd_close(c);
 		    break;
 		  case CHAN_SOCKDATA:
+		    if (c->u.pfd.s != NULL)
+			pfd_close(c->u.pfd.s);
+		    sshfwd_close(c);
 		    break;
 		}
+		if (c->closes == 0) {
+		    ssh2_pkt_init(SSH2_MSG_CHANNEL_CLOSE);
+		    ssh2_pkt_adduint32(c->remoteid);
+		    ssh2_pkt_send();
+		}
 		del234(ssh_channels, c);
 		bufchain_clear(&c->v.v2.outbuffer);
 		sfree(c);