summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2015-08-19 16:33:32 +0100
commit34592a434851697537873eed1eb83ba0a640c5c8 (patch)
tree678445f71ce26a1bfe587d371d0422820fcd4517
parentfbe5bd9e957ea90404158b3a3c11a6b91fe6f010 (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 156a196dc..45cef8829 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1707,8 +1707,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1707 exit_status = 0; 1707 exit_status = 0;
1708 } 1708 }
1709 1709
1710 if (received_signal) 1710 if (received_signal) {
1711 fatal("Killed by signal %d.", (int) received_signal); 1711 debug("Killed by signal %d.", (int) received_signal);
1712 cleanup_exit((int) received_signal + 128);
1713 }
1712 1714
1713 /* 1715 /*
1714 * In interactive mode (with pseudo tty) display a message indicating 1716 * In interactive mode (with pseudo tty) display a message indicating