diff options
| author |   dtucker <dtucker@openbsd.org> | 2016-10-19 23:21:56 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2016-10-19 23:21:56 +0000 |
| commit | c8f866d43b86da2b84d1a6e2d141b58fb86b6a2f (patch) | |
| tree | a3e67d2690f3eeabf4fb9cf0e0a51d834bc5641d | |
| parent | Avoid the confusion that -a might require a section argument; it does not. (diff) | |
| download | wireguard-openbsd-c8f866d43b86da2b84d1a6e2d141b58fb86b6a2f.tar.xz wireguard-openbsd-c8f866d43b86da2b84d1a6e2d141b58fb86b6a2f.zip | |
When tearing down ControlMaster connecctions, don't pollute stderr when
LogLevel=quiet. Patch from Tim Kuijsten via tech@.
| -rw-r--r-- | usr.bin/ssh/mux.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 1f19ee78e0a..ba45ef7a254 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -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> * @@ -2212,7 +2212,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) @@ -2230,7 +2231,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) |