diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-07-02 22:32:43 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-07-02 22:32:43 +1000 |
commit | 8748b965224cea8811d30c8fe9b5d2113d7e49de (patch) | |
tree | 819f130e9df8c70a553f647becb1751a4ecc6de3 | |
parent | 8810dd41b9c5903452badac57aee3dee24c20be5 (diff) |
- djm@cvs.openbsd.org 2008/06/30 12:16:02
[nchan.c]
only send eow@openssh.com notifications for session channels; ok! markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | nchan.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -7,6 +7,9 @@ | |||
7 | [serverloop.c] | 7 | [serverloop.c] |
8 | only pass channel requests on session channels through to the session | 8 | only pass channel requests on session channels through to the session |
9 | channel handler, avoiding spurious log messages; ok! markus@ | 9 | channel handler, avoiding spurious log messages; ok! markus@ |
10 | - djm@cvs.openbsd.org 2008/06/30 12:16:02 | ||
11 | [nchan.c] | ||
12 | only send eow@openssh.com notifications for session channels; ok! markus@ | ||
10 | 13 | ||
11 | 20080630 | 14 | 20080630 |
12 | - (djm) OpenBSD CVS Sync | 15 | - (djm) OpenBSD CVS Sync |
@@ -4490,4 +4493,4 @@ | |||
4490 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4493 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4491 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4494 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4492 | 4495 | ||
4493 | $Id: ChangeLog,v 1.5040 2008/07/02 12:32:14 dtucker Exp $ | 4496 | $Id: ChangeLog,v 1.5041 2008/07/02 12:32:43 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: nchan.c,v 1.59 2008/05/09 16:21:13 markus Exp $ */ | 1 | /* $OpenBSD: nchan.c,v 1.60 2008/06/30 12:16:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -334,7 +334,8 @@ chan_write_failed2(Channel *c) | |||
334 | case CHAN_OUTPUT_OPEN: | 334 | case CHAN_OUTPUT_OPEN: |
335 | case CHAN_OUTPUT_WAIT_DRAIN: | 335 | case CHAN_OUTPUT_WAIT_DRAIN: |
336 | chan_shutdown_write(c); | 336 | chan_shutdown_write(c); |
337 | chan_send_eow2(c); | 337 | if (strcmp(c->ctype, "session") == 0) |
338 | chan_send_eow2(c); | ||
338 | chan_set_ostate(c, CHAN_OUTPUT_CLOSED); | 339 | chan_set_ostate(c, CHAN_OUTPUT_CLOSED); |
339 | break; | 340 | break; |
340 | default: | 341 | default: |