From 4814f577d89ea272df7acc33b06c5154a960c53e Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 2 Dec 2021 02:44:44 +0000 Subject: [PATCH] don't put the tty into raw mode when SessionType=none, avoids ^c being unable to kill such a session. bz3360; ok dtucker@ --- usr.bin/ssh/ssh.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 3b656496617..af4bf6480c8 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1321,7 +1321,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) && -- 2.20.1