summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2014-02-09 16:09:55 +0000
committerColin Watson <cjwatson@debian.org>2016-12-26 00:55:59 +0000
commit68d399525871ecd1a2837f04045581a2774ba4bb (patch)
tree03112600b6be6d28e0107074348617de525e2bde
parentbdc8262449eefe39f2dc4ddcbb44b84ddade4cd3 (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 99c68b690..5876cc9af 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1755,8 +1755,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1755 exit_status = 0; 1755 exit_status = 0;
1756 } 1756 }
1757 1757
1758 if (received_signal) 1758 if (received_signal) {
1759 fatal("Killed by signal %d.", (int) received_signal); 1759 debug("Killed by signal %d.", (int) received_signal);
1760 cleanup_exit((int) received_signal + 128);
1761 }
1760 1762
1761 /* 1763 /*
1762 * In interactive mode (with pseudo tty) display a message indicating 1764 * In interactive mode (with pseudo tty) display a message indicating