- markus@cvs.openbsd.org 2001/10/11 15:24:00
[clientloop.c]
clear select masks if we return before calling select().
diff --git a/ChangeLog b/ChangeLog
index 7c78325..8052901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
delay detach of session if a channel gets closed but the child is
still alive. however, release pty, since the fd's to the child are
already closed.
+ - markus@cvs.openbsd.org 2001/10/11 15:24:00
+ [clientloop.c]
+ clear select masks if we return before calling select().
20011010
- (djm) OpenBSD CVS Sync
@@ -6710,4 +6713,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1602 2001/10/12 01:35:50 djm Exp $
+$Id: ChangeLog,v 1.1603 2001/10/12 01:36:09 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index 43332d1..0e477bc 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.83 2001/10/10 22:18:47 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.84 2001/10/11 15:24:00 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -343,9 +343,12 @@
FD_SET(fileno(stderr), *writesetp);
} else {
/* channel_prepare_select could have closed the last channel */
- if (session_closed && !channel_still_open()) {
- if (!packet_have_data_to_write())
- return;
+ if (session_closed && !channel_still_open() &&
+ !packet_have_data_to_write()) {
+ /* clear mask since we did not call select() */
+ memset(*readsetp, 0, *maxfdp);
+ memset(*writesetp, 0, *maxfdp);
+ return;
} else {
FD_SET(connection_in, *readsetp);
}