diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | mux.c | 4 | ||||
-rw-r--r-- | sshd.c | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -5,6 +5,10 @@ | |||
5 | downgrade an error() to a debug() - this particular case can be hit in | 5 | downgrade an error() to a debug() - this particular case can be hit in |
6 | normal operation for certain sequences of mux slave vs session closure | 6 | normal operation for certain sequences of mux slave vs session closure |
7 | and is harmless | 7 | and is harmless |
8 | - djm@cvs.openbsd.org 2010/01/29 00:20:41 | ||
9 | [sshd.c] | ||
10 | set FD_CLOEXEC on sock_in/sock_out; bz#1706 from jchadima AT redhat.com | ||
11 | ok dtucker@ | ||
8 | 12 | ||
9 | 20100129 | 13 | 20100129 |
10 | - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config() | 14 | - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config() |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.12 2010/01/27 13:26:17 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.13 2010/01/29 20:16:17 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -212,7 +212,7 @@ mux_master_control_cleanup_cb(int cid, void *unused) | |||
212 | sc->ctl_chan = -1; | 212 | sc->ctl_chan = -1; |
213 | if (sc->type != SSH_CHANNEL_OPEN) { | 213 | if (sc->type != SSH_CHANNEL_OPEN) { |
214 | debug2("%s: channel %d: not open", __func__, sc->self); | 214 | debug2("%s: channel %d: not open", __func__, sc->self); |
215 | chan_mark_dead(c); | 215 | chan_mark_dead(sc); |
216 | } else { | 216 | } else { |
217 | chan_read_failed(sc); | 217 | chan_read_failed(sc); |
218 | chan_write_failed(sc); | 218 | chan_write_failed(sc); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.371 2010/01/13 03:48:13 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.372 2010/01/29 00:20:41 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1748,6 +1748,10 @@ main(int ac, char **av) | |||
1748 | sock_in, sock_out, newsock, startup_pipe, config_s[0]); | 1748 | sock_in, sock_out, newsock, startup_pipe, config_s[0]); |
1749 | } | 1749 | } |
1750 | 1750 | ||
1751 | /* Executed child processes don't need these. */ | ||
1752 | fcntl(sock_out, F_SETFD, FD_CLOEXEC); | ||
1753 | fcntl(sock_in, F_SETFD, FD_CLOEXEC); | ||
1754 | |||
1751 | /* | 1755 | /* |
1752 | * Disable the key regeneration alarm. We will not regenerate the | 1756 | * Disable the key regeneration alarm. We will not regenerate the |
1753 | * key since we are no longer in a position to give it to anyone. We | 1757 | * key since we are no longer in a position to give it to anyone. We |