summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2015-09-17 13:52:40 +0100
commitdd148bdfe1da6fbce48c9d8ed5d74b3ad05de935 (patch)
treee0e1463d94a325597ea48807ecd7359bc63d9946
parentff5dffb6e1e7b0c5cd6cf8f47fa89bcef10e666d (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 964353dc3..65f90b8b4 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1720,8 +1720,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1720 exit_status = 0; 1720 exit_status = 0;
1721 } 1721 }
1722 1722
1723 if (received_signal) 1723 if (received_signal) {
1724 fatal("Killed by signal %d.", (int) received_signal); 1724 debug("Killed by signal %d.", (int) received_signal);
1725 cleanup_exit((int) received_signal + 128);
1726 }
1725 1727
1726 /* 1728 /*
1727 * In interactive mode (with pseudo tty) display a message indicating 1729 * In interactive mode (with pseudo tty) display a message indicating