summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-05-19 16:04:56 +1000
committerDamien Miller <djm@mindrot.org>2008-05-19 16:04:56 +1000
commit2ff1ca56ebee93d2881e4abaab1b8bc84dad4db8 (patch)
tree1800c71809f80725e26a40ece28ef120183b1053
parentb3da593962885883feca47ceb36617ab3eafcee8 (diff)
- markus@cvs.openbsd.org 2008/05/09 16:16:06
[session.c] re-add the USE_PIPES code and enable it. without pipes shutdown-read from the sshd does not trigger a SIGPIPE when the forked program does a write. ok djm@ (Id sync only, USE_PIPES never left portable OpenSSH)
-rw-r--r--ChangeLog9
-rw-r--r--session.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e4cff0070..513fbe243 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,13 @@
120 - djm@cvs.openbsd.org 2008/05/09 14:26:08 120 - djm@cvs.openbsd.org 2008/05/09 14:26:08
121 [ssh.c] 121 [ssh.c]
122 dingo stole my diff hunk 122 dingo stole my diff hunk
123 - markus@cvs.openbsd.org 2008/05/09 16:16:06
124 [session.c]
125 re-add the USE_PIPES code and enable it.
126 without pipes shutdown-read from the sshd does not trigger
127 a SIGPIPE when the forked program does a write.
128 ok djm@
129 (Id sync only, USE_PIPES never left portable OpenSSH)
123 130
12420080403 13120080403
125 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 132 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3980,4 +3987,4 @@
3980 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3987 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3981 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3988 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3982 3989
3983$Id: ChangeLog,v 1.4927 2008/05/19 06:02:37 djm Exp $ 3990$Id: ChangeLog,v 1.4928 2008/05/19 06:04:56 djm Exp $
diff --git a/session.c b/session.c
index c8ed25234..b4afed6fd 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.237 2008/05/08 12:21:16 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.238 2008/05/09 16:16:06 markus Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved