Fredrik Fornwall
6 years ago
2 changed files with 2 additions and 54 deletions
@ -1,52 +0,0 @@ |
|||
From 7bc6280613f5ab4ee86c14c779739070e5784dfe Mon Sep 17 00:00:00 2001 |
|||
From: Matt Johnston <matt@ucc.asn.au> |
|||
Date: Sun, 24 Mar 2019 20:41:02 +0800 |
|||
Subject: [PATCH] Fix regression where TTY modes weren't reset for client |
|||
|
|||
---
|
|||
cli-chansession.c | 10 +++++----- |
|||
1 file changed, 5 insertions(+), 5 deletions(-) |
|||
|
|||
diff --git a/cli-chansession.c b/cli-chansession.c
|
|||
index 8b72e279..cfd3401b 100644
|
|||
--- a/cli-chansession.c
|
|||
+++ b/cli-chansession.c
|
|||
@@ -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 @@ const struct ChanType clichansess = {
|
|||
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 @@ static void cli_chansessreq(struct Channel *channel) {
|
|||
|
|||
|
|||
/* 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 @@ static const struct ChanType cli_chan_netcat = {
|
|||
cli_init_netcat, /* inithandler */ |
|||
NULL, |
|||
NULL, |
|||
+ cli_closechansess,
|
|||
NULL, |
|||
- cli_cleanupchansess
|
|||
}; |
|||
|
|||
void cli_send_netcat_request() { |
Loading…
Reference in new issue