tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2010-12-01 12:02:35 +11:00
parent d0fdd6818c
commit b7f827ae45
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -20,6 +20,11 @@
[clientloop.c] [clientloop.c]
avoid NULL deref on receiving a channel request on an unknown or invalid avoid NULL deref on receiving a channel request on an unknown or invalid
channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@ channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@
- 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
20101124 20101124
- (dtucker) [platform.c session.c] Move the getluid call out of session.c and - (dtucker) [platform.c session.c] Move the getluid call out of session.c and

5
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.309 2010/08/05 13:08:42 djm Exp $ */ /* $OpenBSD: channels.c,v 1.310 2010/11/24 01:24:14 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -373,9 +373,6 @@ channel_close_fd(int *fdp)
static void static void
channel_close_fds(Channel *c) channel_close_fds(Channel *c)
{ {
debug3("channel %d: close_fds r %d w %d e %d",
c->self, c->rfd, c->wfd, c->efd);
channel_close_fd(&c->sock); channel_close_fd(&c->sock);
channel_close_fd(&c->rfd); channel_close_fd(&c->rfd);
channel_close_fd(&c->wfd); channel_close_fd(&c->wfd);