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

     [nchan.c]
     only send eow@openssh.com notifications for session channels; ok! markus@

diff --git a/ChangeLog b/ChangeLog
index 90c6f4ac55c512b19d7c72775e785a39ad25dbcc..388ce474e5e85b3cd9a337156707c59b44c332f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
      [serverloop.c]
      only pass channel requests on session channels through to the session
      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
  - (djm) OpenBSD CVS Sync

diff --git a/nchan.c b/nchan.c
index a4a456eab8f456f304d5f2608e8c2cd58f97d811..e0ebf43f151c74ba7049c2199f89dee62a13f52e 100644 (file)
--- a/nchan.c
+++ b/nchan.c
@@ -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.
  *
@@ -334,7 +334,8 @@ chan_write_failed2(Channel *c)
        case CHAN_OUTPUT_OPEN:
        case CHAN_OUTPUT_WAIT_DRAIN:
                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);
                break;
        default: