summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2015-11-29 17:36:19 +0000
commitf7d2bb35f07cfcab63fc8cf3cd9bef646065482c (patch)
tree1bc2580c14ae1cb270c8384937c2c5ea47e7f91a
parent063fd3991309c88df5ea2625d663c3958e79b841 (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 9e45d24e0..5c2b7217f 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1721,8 +1721,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1721 exit_status = 0; 1721 exit_status = 0;
1722 } 1722 }
1723 1723
1724 if (received_signal) 1724 if (received_signal) {
1725 fatal("Killed by signal %d.", (int) received_signal); 1725 debug("Killed by signal %d.", (int) received_signal);
1726 cleanup_exit((int) received_signal + 128);
1727 }
1726 1728
1727 /* 1729 /*
1728 * In interactive mode (with pseudo tty) display a message indicating 1730 * In interactive mode (with pseudo tty) display a message indicating