3 files changed, 2 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f465d5d10..7748d9b8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
    - markus@cvs.openbsd.org 2001/03/23 14:28:32
      [session.c sshd.c]
      ignore SIGPIPE, restore in child, fixes x11-fwd crashes; with djm@
+ - (djm) Pull out our own SIGPIPE hacks
 
 20010323
  - OpenBSD CVS Sync                             
@@ -4704,4 +4705,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1014 2001/03/24 00:43:26 mouring Exp $
+$Id: ChangeLog,v 1.1015 2001/03/24 04:39:38 djm Exp $
diff --git a/serverloop.c b/serverloop.c
index 66bc52573..d1290ff22 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -420,7 +420,6 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
         child_pid = pid;
         child_terminated = 0;
         signal(SIGCHLD, sigchld_handler);
-        signal(SIGPIPE, SIG_IGN);
 
         /* Initialize our global variables. */
         fdin = fdin_arg;
@@ -655,7 +654,6 @@ server_loop2(void)
         debug("Entering interactive session for SSH2.");
 
         mysignal(SIGCHLD, sigchld_handler2);
-        signal(SIGPIPE, SIG_IGN);
         child_terminated = 0;
         connection_in = packet_get_connection_in();
         connection_out = packet_get_connection_out();
diff --git a/session.c b/session.c
index 13fe01870..af5c836bc 100644
--- a/session.c
+++ b/session.c
@@ -496,8 +496,6 @@ do_exec_no_pty(Session *s, const char *command)
                 /* Child.  Reinitialize the log since the pid has changed. */
                 log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
-                signal(SIGPIPE, SIG_DFL);
-
                 /*
                  * Create a new session and process group since the 4.4BSD
                  * setlogin() affects the entire process group.
@@ -613,8 +611,6 @@ do_exec_pty(Session *s, const char *command)
                 /* Child.  Reinitialize the log because the pid has changed. */
                 log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
-                signal(SIGPIPE, SIG_DFL);
-
                 /* Close the master side of the pseudo tty. */
                 close(ptyfd);