summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-05-17 03:19:40 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-05-17 03:19:40 +0000
commitc8b3f476765c2f24cb50462e397262028fc28a2e (patch)
tree2e1697610c8fd4669c3fb2247894ce67518fb869 /clientloop.c
parent06b08018ef12d8bdf86b0ad3c2508666b789df70 (diff)
- markus@cvs.openbsd.org 2001/05/16 21:53:53
[clientloop.c] check for open sessions before we call select(); fixes the x11 client bug reported by bowman@math.ualberta.ca
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c
index ba957fe4..cea6e77d 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.70 2001/05/11 14:59:55 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.71 2001/05/16 21:53:53 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -346,7 +346,13 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
if (buffer_len(&stderr_buffer) > 0)
FD_SET(fileno(stderr), *writesetp);
} else {
- FD_SET(connection_in, *readsetp);
+ /* channel_prepare_select could have closed the last channel */
+ if (session_closed && !channel_still_open()) {
+ if (!packet_have_data_to_write())
+ return;
+ } else {
+ FD_SET(connection_in, *readsetp);
+ }
}
/* Select server connection if have data to write to the server. */