summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2016-08-07 12:18:43 +0100
commit8eeec10866f78acd021824225e9d62e4a18fc2c3 (patch)
tree128b1e67b5d6589844634229a3d6d372494bc9eb
parent21fb55231ad0422fa0e5f0c2f67093cb5f29dd47 (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 421241f74..e5cc3f8cb 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1757,8 +1757,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1757 exit_status = 0; 1757 exit_status = 0;
1758 } 1758 }
1759 1759
1760 if (received_signal) 1760 if (received_signal) {
1761 fatal("Killed by signal %d.", (int) received_signal); 1761 debug("Killed by signal %d.", (int) received_signal);
1762 cleanup_exit((int) received_signal + 128);
1763 }
1762 1764
1763 /* 1765 /*
1764 * In interactive mode (with pseudo tty) display a message indicating 1766 * In interactive mode (with pseudo tty) display a message indicating