summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2014-10-07 14:26:47 +0100
commitdc028c5992b4b14cca380b6ad2115fcc6907a8b7 (patch)
tree227544fdfcdc05f4128ae1ed136822956a3bae13
parent69f7c00e04d1baa01a9038eeb764cfed0830fb19 (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
-rw-r--r--clientloop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c
index 046ca8b7c..0180774bb 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1705,8 +1705,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1705 exit_status = 0; 1705 exit_status = 0;
1706 } 1706 }
1707 1707
1708 if (received_signal) 1708 if (received_signal) {
1709 fatal("Killed by signal %d.", (int) received_signal); 1709 debug("Killed by signal %d.", (int) received_signal);
1710 cleanup_exit((int) received_signal + 128);
1711 }
1710 1712
1711 /* 1713 /*
1712 * In interactive mode (with pseudo tty) display a message indicating 1714 * In interactive mode (with pseudo tty) display a message indicating