tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 07:15:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
When tearing down ControlMaster connecctions, don't
pollute stderr when LogLevel=quiet.  Patch from Tim Kuijsten via tech@.

Upstream-ID: d9b3a68b2a7c2f2fc7f74678e29a4618d55ceced
This commit is contained in:
dtucker@openbsd.org 2016-10-19 23:21:56 +00:00 committed by Darren Tucker
parent 09e6a7d835
commit 0b9ee623d5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mux.c
View File

@ -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> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -2234,6 +2234,7 @@ muxclient(const char *path)
exit(0); exit(0);
case SSHMUX_COMMAND_TERMINATE: case SSHMUX_COMMAND_TERMINATE:
mux_client_request_terminate(sock); mux_client_request_terminate(sock);
if (options.log_level != SYSLOG_LEVEL_QUIET)
fprintf(stderr, "Exit request sent.\r\n"); fprintf(stderr, "Exit request sent.\r\n");
exit(0); exit(0);
case SSHMUX_COMMAND_FORWARD: case SSHMUX_COMMAND_FORWARD:
@ -2252,6 +2253,7 @@ muxclient(const char *path)
exit(0); exit(0);
case SSHMUX_COMMAND_STOP: case SSHMUX_COMMAND_STOP:
mux_client_request_stop_listening(sock); mux_client_request_stop_listening(sock);
if (options.log_level != SYSLOG_LEVEL_QUIET)
fprintf(stderr, "Stop listening request sent.\r\n"); fprintf(stderr, "Stop listening request sent.\r\n");
exit(0); exit(0);
case SSHMUX_COMMAND_CANCEL_FWD: case SSHMUX_COMMAND_CANCEL_FWD: