diff options
author | Damien Miller <djm@mindrot.org> | 2001-03-24 15:39:38 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-03-24 15:39:38 +1100 |
commit | b44fe0617d747c9dbf3cb074661639dccad5a3f0 (patch) | |
tree | d38fbc281e07c67b1b73f8c0228ceff1ec10478a | |
parent | de71cda07824ec31b5ad2965879fab123d743708 (diff) | |
download | openssh-git-b44fe0617d747c9dbf3cb074661639dccad5a3f0.tar.gz |
- (djm) Pull out our own SIGPIPE hacks
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | serverloop.c | 2 | ||||
-rw-r--r-- | session.c | 4 |
3 files changed, 2 insertions, 7 deletions
@@ -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 66bc5257..d1290ff2 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(); @@ -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); |