diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-10-20 01:21:56 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-10-24 01:42:57 +0200 |
| commit | 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894 (patch) | |
| tree | 855662f07018453f3f81e256bd1b63edf878b158 /mux.c | |
| parent | Wrap stdint.h include in ifdef. (diff) | |
| download | openssh-0b9ee623d57e5de7e83e66fd61a7ba9a5be98894.tar.xz openssh-0b9ee623d57e5de7e83e66fd61a7ba9a5be98894.zip | |
upstream commit
When tearing down ControlMaster connecctions, don't
pollute stderr when LogLevel=quiet. Patch from Tim Kuijsten via tech@.
Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.62 2016/09/30 09:19:13 markus Exp $ */ +/* $OpenBSD: mux.c,v 1.63 2016/10/19 23:21:56 dtucker Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -2234,7 +2234,8 @@ muxclient(const char *path) exit(0); case SSHMUX_COMMAND_TERMINATE: mux_client_request_terminate(sock); - fprintf(stderr, "Exit request sent.\r\n"); + if (options.log_level != SYSLOG_LEVEL_QUIET) + fprintf(stderr, "Exit request sent.\r\n"); exit(0); case SSHMUX_COMMAND_FORWARD: if (mux_client_forwards(sock, 0) != 0) @@ -2252,7 +2253,8 @@ muxclient(const char *path) exit(0); case SSHMUX_COMMAND_STOP: mux_client_request_stop_listening(sock); - fprintf(stderr, "Stop listening request sent.\r\n"); + if (options.log_level != SYSLOG_LEVEL_QUIET) + fprintf(stderr, "Stop listening request sent.\r\n"); exit(0); case SSHMUX_COMMAND_CANCEL_FWD: if (mux_client_forwards(sock, 1) != 0) |