diff options
author | Peter Samuelson <peter@p12n.org> | 2014-02-09 16:09:55 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:24:49 +0000 |
commit | 9875e47079abff55f8d2c1e958e9d50de6eae7ec (patch) | |
tree | e6e445f5ba8ca01faf917204187a15f2740e3e0d /clientloop.c | |
parent | b8ed36cdf2dbebc01e52e83eece4bb1d78607e84 (diff) |
Reduce severity of "Killed by signal %d"
This produces irritating messages when using ProxyCommand or other programs
that use ssh under the covers (e.g. Subversion). These messages are more
normally printed by the calling program, such as the shell.
According to the upstream bug, the right way to avoid this is to use the -q
option, so we may drop this patch after further investigation into whether
any software in Debian is still relying on it.
Author: Colin Watson <cjwatson@debian.org>
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1118
Bug-Debian: http://bugs.debian.org/313371
Last-Update: 2013-09-14
Patch-Name: quieter-signals.patch
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index 73a800ce6..4bc5b57d2 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1717,8 +1717,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1717 | exit_status = 0; | 1717 | exit_status = 0; |
1718 | } | 1718 | } |
1719 | 1719 | ||
1720 | if (received_signal) | 1720 | if (received_signal) { |
1721 | fatal("Killed by signal %d.", (int) received_signal); | 1721 | debug("Killed by signal %d.", (int) received_signal); |
1722 | cleanup_exit((int) received_signal + 128); | ||
1723 | } | ||
1722 | 1724 | ||
1723 | /* | 1725 | /* |
1724 | * In interactive mode (with pseudo tty) display a message indicating | 1726 | * In interactive mode (with pseudo tty) display a message indicating |