summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2016-02-29 12:33:29 +0000
commit754544297b321ab1ce1923e6aa9987bb82dd4fc5 (patch)
tree64a9f5d12eaa0600fcdba0809d955560d5551b54
parentc87856cd1b99bc4188b145b0689af5e1d1babe24 (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 1567e4a2f..3b6cacb08 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1753,8 +1753,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1753 exit_status = 0; 1753 exit_status = 0;
1754 } 1754 }
1755 1755
1756 if (received_signal) 1756 if (received_signal) {
1757 fatal("Killed by signal %d.", (int) received_signal); 1757 debug("Killed by signal %d.", (int) received_signal);
1758 cleanup_exit((int) received_signal + 128);
1759 }
1758 1760
1759 /* 1761 /*
1760 * In interactive mode (with pseudo tty) display a message indicating 1762 * In interactive mode (with pseudo tty) display a message indicating