From a882a09722c9f086c9edb65d0c4022fd965ec1ed Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 11 Jan 2022 01:26:47 +0000 Subject: [PATCH] upstream: suppress "Connection to xxx closed" messages at LogLevel >= error bz3378; ok dtucker@ OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c --- clientloop.c | 4 ++-- mux.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clientloop.c b/clientloop.c index 63443a468..546daabd0 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.375 2022/01/06 21:57:28 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.376 2022/01/11 01:26:47 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1430,7 +1430,7 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg, * In interactive mode (with pseudo tty) display a message indicating * that the connection has been closed. */ - if (have_pty && options.log_level != SYSLOG_LEVEL_QUIET) { + if (have_pty && options.log_level >= SYSLOG_LEVEL_INFO) { if ((r = sshbuf_putf(stderr_buffer, "Connection to %.64s closed.\r\n", host)) != 0) fatal_fr(r, "sshbuf_putf"); diff --git a/mux.c b/mux.c index 4c0eb4249..176f035c8 100644 --- a/mux.c +++ b/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.91 2021/07/23 04:00:59 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.92 2022/01/11 01:26:47 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -2037,7 +2037,7 @@ mux_client_request_session(int fd) } else debug2("Received exit status from master %d", exitval); - if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) + if (tty_flag && options.log_level >= SYSLOG_LEVEL_INFO) fprintf(stderr, "Shared connection to %s closed.\r\n", host); exit(exitval);