[openssh-commits] [openssh] 01/01: upstream: don't put the tty into raw mode when SessionType=none, avoids

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit dc91ceea33cd4a9f05be953e8d8062f732db5c8a
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Dec 2 02:44:44 2021 +0000

    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
---
 ssh.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssh.c b/ssh.c
index e6fe8090..2aef914a 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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) &&

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.