- markus@cvs.openbsd.org 2001/10/24 08:51:35

     [clientloop.c ssh.c]
     ignore SIGPIPE early, makes ssh work if agent dies, netbsd-pr via itojun@

diff --git a/ChangeLog b/ChangeLog
index 9b65d5dc746d129ad4a8ce6d45a6ec1da2ffeb7e..a94ff94246258027d1f58e587a9cccb6659dc2b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
    - markus@cvs.openbsd.org 2001/10/24 08:41:20
      [ssh.c]
      remove unused
+   - markus@cvs.openbsd.org 2001/10/24 08:51:35
+     [clientloop.c ssh.c]
+     ignore SIGPIPE early, makes ssh work if agent dies, netbsd-pr via itojun@
 
 20011109
  - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)

diff --git a/clientloop.c b/clientloop.c
index 0e477bc79363bc2f68b61380660b33019b04bbc5..7e6fe269ab106b024cd6b9ef3bae8e81edc3e0d7 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.84 2001/10/11 15:24:00 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.85 2001/10/24 08:51:35 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -820,7 +820,6 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
        signal(SIGINT, signal_handler);
        signal(SIGQUIT, signal_handler);
        signal(SIGTERM, signal_handler);
-       signal(SIGPIPE, SIG_IGN);
        if (have_pty)
                signal(SIGWINCH, window_change_handler);
 

diff --git a/ssh.c b/ssh.c
index dce7530bbfbf24600a213e7305c8fce9cbdf69f2..2984a597fb88c200042e137c9f62ae49ea24414a 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.148 2001/10/24 08:41:20 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.149 2001/10/24 08:51:35 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -752,6 +752,8 @@ again:
        options.user_hostfile2 =
            tilde_expand_filename(options.user_hostfile2, original_real_uid);
 
+       signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
+
        /* Log into the remote system.  This never returns if the login fails. */
        ssh_login(sensitive_data.keys, sensitive_data.nkeys,
            host, (struct sockaddr *)&hostaddr, pw);