diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-10-19 23:21:56 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-10-24 10:42:57 +1100 |
commit | 0b9ee623d57e5de7e83e66fd61a7ba9a5be98894 (patch) | |
tree | 855662f07018453f3f81e256bd1b63edf878b158 /mux.c | |
parent | 09e6a7d8354224933febc08ddcbc2010f542284e (diff) |
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 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.62 2016/09/30 09:19:13 markus Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.63 2016/10/19 23:21:56 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -2234,7 +2234,8 @@ muxclient(const char *path) | |||
2234 | exit(0); | 2234 | exit(0); |
2235 | case SSHMUX_COMMAND_TERMINATE: | 2235 | case SSHMUX_COMMAND_TERMINATE: |
2236 | mux_client_request_terminate(sock); | 2236 | mux_client_request_terminate(sock); |
2237 | fprintf(stderr, "Exit request sent.\r\n"); | 2237 | if (options.log_level != SYSLOG_LEVEL_QUIET) |
2238 | fprintf(stderr, "Exit request sent.\r\n"); | ||
2238 | exit(0); | 2239 | exit(0); |
2239 | case SSHMUX_COMMAND_FORWARD: | 2240 | case SSHMUX_COMMAND_FORWARD: |
2240 | if (mux_client_forwards(sock, 0) != 0) | 2241 | if (mux_client_forwards(sock, 0) != 0) |
@@ -2252,7 +2253,8 @@ muxclient(const char *path) | |||
2252 | exit(0); | 2253 | exit(0); |
2253 | case SSHMUX_COMMAND_STOP: | 2254 | case SSHMUX_COMMAND_STOP: |
2254 | mux_client_request_stop_listening(sock); | 2255 | mux_client_request_stop_listening(sock); |
2255 | fprintf(stderr, "Stop listening request sent.\r\n"); | 2256 | if (options.log_level != SYSLOG_LEVEL_QUIET) |
2257 | fprintf(stderr, "Stop listening request sent.\r\n"); | ||
2256 | exit(0); | 2258 | exit(0); |
2257 | case SSHMUX_COMMAND_CANCEL_FWD: | 2259 | case SSHMUX_COMMAND_CANCEL_FWD: |
2258 | if (mux_client_forwards(sock, 1) != 0) | 2260 | if (mux_client_forwards(sock, 1) != 0) |