summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-01-11 01:26:47 +0000
committerDamien Miller <djm@mindrot.org>2022-01-12 09:33:35 +1100
commita882a09722c9f086c9edb65d0c4022fd965ec1ed (patch)
tree2b6d283b8dbeee8c037ca73df6bac00bba962326
parent61a1a6af22e17fc94999a5d1294f27346e6c4668 (diff)
downloadopenssh-git-a882a09722c9f086c9edb65d0c4022fd965ec1ed.tar.gz
upstream: suppress "Connection to xxx closed" messages at LogLevel >=
error bz3378; ok dtucker@ OpenBSD-Commit-ID: d5bf457d5d2eb927b81d0663f45248a31028265c
-rw-r--r--clientloop.c4
-rw-r--r--mux.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c
index 63443a46..546daabd 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 <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 4c0eb424..176f035c 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 <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);