From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 2 Dec 2021 02:44:44 +0000 (+0000)
Subject: upstream: don't put the tty into raw mode when SessionType=none, avoids
X-Git-Tag: V_8_9_P1~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc91ceea33cd4a9f05be953e8d8062f732db5c8a;p=thirdparty%2Fopenssh-portable.git

upstream: don't put the tty into raw mode when SessionType=none, avoids

^c being unable to kill such a session. bz3360; ok dtucker@

OpenBSD-Commit-ID: 83960c433052303b643b4c380ae2f799ac896f65
---

diff --git a/ssh.c b/ssh.c
index e6fe80909..2aef914ad 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.569 2021/09/20 04:02:13 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.570 2021/12/02 02:44:44 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1342,7 +1342,8 @@ main(int ac, char **av)
 
 	/* Force no tty */
 	if (options.request_tty == REQUEST_TTY_NO ||
-	    (muxclient_command && muxclient_command != SSHMUX_COMMAND_PROXY))
+	    (muxclient_command && muxclient_command != SSHMUX_COMMAND_PROXY) ||
+	    options.session_type == SESSION_TYPE_NONE)
 		tty_flag = 0;
 	/* Do not allocate a tty if stdin is not a tty. */
 	if ((!isatty(fileno(stdin)) || options.stdin_null) &&