RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2008/06/30 12:16:02 

[nchan.c]
     only send eow@openssh.com notifications for session channels; ok! markus@
This commit is contained in:
Darren Tucker 2008-07-02 22:32:43 +10:00
parent 8810dd41b9
commit 8748b96522
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -7,6 +7,9 @@
[serverloop.c] [serverloop.c]
only pass channel requests on session channels through to the session only pass channel requests on session channels through to the session
channel handler, avoiding spurious log messages; ok! markus@ channel handler, avoiding spurious log messages; ok! markus@
- djm@cvs.openbsd.org 2008/06/30 12:16:02
[nchan.c]
only send eow@openssh.com notifications for session channels; ok! markus@
20080630 20080630
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -4490,4 +4493,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5040 2008/07/02 12:32:14 dtucker Exp $ $Id: ChangeLog,v 1.5041 2008/07/02 12:32:43 dtucker Exp $

5
nchan.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: nchan.c,v 1.59 2008/05/09 16:21:13 markus Exp $ */ /* $OpenBSD: nchan.c,v 1.60 2008/06/30 12:16:02 djm Exp $ */
/* /*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
* *
@ -334,7 +334,8 @@ chan_write_failed2(Channel *c)
case CHAN_OUTPUT_OPEN: case CHAN_OUTPUT_OPEN:
case CHAN_OUTPUT_WAIT_DRAIN: case CHAN_OUTPUT_WAIT_DRAIN:
chan_shutdown_write(c); chan_shutdown_write(c);
chan_send_eow2(c); if (strcmp(c->ctype, "session") == 0)
chan_send_eow2(c);
chan_set_ostate(c, CHAN_OUTPUT_CLOSED); chan_set_ostate(c, CHAN_OUTPUT_CLOSED);
break; break;
default: default: