commit 144e8d60cd3dcfdbf23c6df06617adf28b1235b8
author Darren Tucker <dtucker@zip.com.au> Sun Jun 25 08:25:25 2006 +1000
committer Darren Tucker <dtucker@zip.com.au> Sun Jun 25 08:25:25 2006 +1000
tree d5f2d0a42de6557c30053d5d44108837266ca2f2
parent 03890e44cd4814c2a9909febe5130fef722c7f4b

 - (dtucker) [channels.c serverloop.c] Apply the bug #1102 workaround to ptys
   only, otherwise sshd can hang exiting non-interactive sessions.

channels.c

diff --git a/channels.c b/channels.c
index 239e9dd..9642a56 100644
--- a/channels.c
+++ b/channels.c
@@ -1422,7 +1422,8 @@
 #ifndef PTY_ZEROREAD
 		if (len <= 0) {
 #else
-		if (len < 0 || (len == 0 && errno != 0)) {
+		if ((!c->isatty && len <= 0) ||
+		    (c->isatty && (len < 0 || (len == 0 && errno != 0)))) {
 #endif
 			debug2("channel %d: read<=0 rfd %d len %d",
 			    c->self, c->rfd, len);