1 files changed, 11 insertions, 5 deletions

diff --git a/clientloop.c b/clientloop.c
index 8b1976171..abfde2f3a 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.104 2002/08/22 19:38:42 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.105 2002/11/18 16:43:44 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -908,10 +908,16 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 
         client_init_dispatch();
 
-        /* Set signal handlers to restore non-blocking mode.  */
-        signal(SIGINT, signal_handler);
-        signal(SIGQUIT, signal_handler);
-        signal(SIGTERM, signal_handler);
+        /*
+         * Set signal handlers, (e.g. to restore non-blocking mode)
+         * but don't overwrite SIG_IGN, matches behaviour from rsh(1)
+         */
+        if (signal(SIGINT, SIG_IGN) != SIG_IGN)
+                signal(SIGINT, signal_handler);
+        if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
+                signal(SIGQUIT, signal_handler);
+        if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
+                signal(SIGTERM, signal_handler);
         if (have_pty)
                 signal(SIGWINCH, window_change_handler);