upstream: suppress "Connection to xxx closed" messages at LogLevel >=

error bz3378; ok dtucker@

OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c

diff --git a/clientloop.c b/clientloop.c
index 63443a4682f96e8eca5ada6774a12e418a8e4775..546daabd0cc5dfea92dc355e07c32145b64d0d65 100644 (file)
--- 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 <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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 4c0eb4249bcdb2ba547140ba6c373591c2fe7ac0..176f035c86f5cf4049cc0dc039e8802488a9b7c5 100644 (file)
--- 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 <djm@openbsd.org>
  *
@@ -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);