# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1553431262 -28800
# Node ID 4b01f4826a29a2837e971197d4f72b7cb376745a
# Parent  48c6e54f7281aaf89fbc8b2b99ca4a9cd62969af
Fix regression where TTY modes weren't reset for client

diff -r 48c6e54f7281 -r 4b01f4826a29 cli-chansession.c
--- a/cli-chansession.c	Sat Mar 23 21:54:23 2019 +0800
+++ b/cli-chansession.c	Sun Mar 24 20:41:02 2019 +0800
@@ -35,7 +35,7 @@
 #include "chansession.h"
 #include "agentfwd.h"
 
-static void cli_cleanupchansess(const struct Channel *channel);
+static void cli_closechansess(const struct Channel *channel);
 static int cli_initchansess(struct Channel *channel);
 static void cli_chansessreq(struct Channel *channel);
 static void send_chansess_pty_req(const struct Channel *channel);
@@ -51,8 +51,8 @@
 	cli_initchansess, /* inithandler */
 	NULL, /* checkclosehandler */
 	cli_chansessreq, /* reqhandler */
-	NULL, /* closehandler */
-	cli_cleanupchansess, /* cleanup */
+	cli_closechansess, /* closehandler */
+	NULL, /* cleanup */
 };
 
 static void cli_chansessreq(struct Channel *channel) {
@@ -84,7 +84,7 @@
 	
 
 /* If the main session goes, we close it up */
-static void cli_cleanupchansess(const struct Channel *UNUSED(channel)) {
+static void cli_closechansess(const struct Channel *UNUSED(channel)) {
 	cli_tty_cleanup(); /* Restore tty modes etc */
 
 	/* This channel hasn't gone yet, so we have > 1 */
@@ -388,8 +388,8 @@
 	cli_init_netcat, /* inithandler */
 	NULL,
 	NULL,
+	cli_closechansess,
 	NULL,
-	cli_cleanupchansess
 };
 
 void cli_send_netcat_request() {