RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-04-04 23:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

- reyk@cvs.openbsd.org 2006/01/30 12:22:22

Browse Source 
[channels.c]
     mark channel as write failed or dead instead of read failed on error
     of the channel output filter.
     ok markus@
This commit is contained in:
Damien Miller 2006-01-31 21:47:15 +11:00
parent bbc59094b9
commit e204f6aa0d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -18,6 +18,11 @@
written with a lot of help from jakob; written with a lot of help from jakob;
feedback dtucker/markus; feedback dtucker/markus;
ok markus ok markus
- reyk@cvs.openbsd.org 2006/01/30 12:22:22
[channels.c]
mark channel as write failed or dead instead of read failed on error
of the channel output filter.
ok markus@
20060129 20060129
- (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@ -3743,4 +3748,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4098 2006/01/31 10:46:51 djm Exp $ $Id: ChangeLog,v 1.4099 2006/01/31 10:47:15 djm Exp $

8
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.231 2005/12/30 15:56:36 reyk Exp $"); RCSID("$OpenBSD: channels.c,v 1.232 2006/01/30 12:22:22 reyk Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1466,7 +1466,11 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
if (c->output_filter != NULL) { if (c->output_filter != NULL) {
if ((buf = c->output_filter(c, &data, &dlen)) == NULL) { if ((buf = c->output_filter(c, &data, &dlen)) == NULL) {
debug2("channel %d: filter stops", c->self); debug2("channel %d: filter stops", c->self);
chan_read_failed(c); if (c->type != SSH_CHANNEL_OPEN)
chan_mark_dead(c);
else
chan_write_failed(c);
return -1;
} }
} else if (c->datagram) { } else if (c->datagram) {
buf = data = buffer_get_string(&c->output, &dlen); buf = data = buffer_get_string(&c->output, &dlen);