diff options
author | Damien Miller <djm@mindrot.org> | 2010-12-01 12:02:35 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-12-01 12:02:35 +1100 |
commit | b7f827ae4586f6637bcad36b65ebafb51e727f36 (patch) | |
tree | 0a0ebfa8e8e845f49139851a84dbc20b052b9e19 | |
parent | d0fdd6818c1633656fd47ee1de9438130eb9eb03 (diff) |
- djm@cvs.openbsd.org 2010/11/24 01:24:14
[channels.c]
remove a debug() that pollutes stderr on client connecting to a server
in debug mode (channel_close_fds is called transitively from the session
code post-fork); bz#1719, ok dtucker
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -20,6 +20,11 @@ | |||
20 | [clientloop.c] | 20 | [clientloop.c] |
21 | avoid NULL deref on receiving a channel request on an unknown or invalid | 21 | avoid NULL deref on receiving a channel request on an unknown or invalid |
22 | channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@ | 22 | channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@ |
23 | - djm@cvs.openbsd.org 2010/11/24 01:24:14 | ||
24 | [channels.c] | ||
25 | remove a debug() that pollutes stderr on client connecting to a server | ||
26 | in debug mode (channel_close_fds is called transitively from the session | ||
27 | code post-fork); bz#1719, ok dtucker | ||
23 | 28 | ||
24 | 20101124 | 29 | 20101124 |
25 | - (dtucker) [platform.c session.c] Move the getluid call out of session.c and | 30 | - (dtucker) [platform.c session.c] Move the getluid call out of session.c and |
diff --git a/channels.c b/channels.c index 1cd5004c4..6abe2d012 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.309 2010/08/05 13:08:42 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.310 2010/11/24 01:24:14 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 |
@@ -373,9 +373,6 @@ channel_close_fd(int *fdp) | |||
373 | static void | 373 | static void |
374 | channel_close_fds(Channel *c) | 374 | channel_close_fds(Channel *c) |
375 | { | 375 | { |
376 | debug3("channel %d: close_fds r %d w %d e %d", | ||
377 | c->self, c->rfd, c->wfd, c->efd); | ||
378 | |||
379 | channel_close_fd(&c->sock); | 376 | channel_close_fd(&c->sock); |
380 | channel_close_fd(&c->rfd); | 377 | channel_close_fd(&c->rfd); |
381 | channel_close_fd(&c->wfd); | 378 | channel_close_fd(&c->wfd); |