summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-04 23:46:07 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-04 23:46:07 +0000
commitbe2cc43c3ad65dc7af5bdd350eccecefa05c80ff (patch)
tree87743bbb2501bd579088303769f73c4f79fd0ad7 /serverloop.c
parent78c261ab4afa9236b54b51663eb35460d2fea635 (diff)
downloadopenssh-git-be2cc43c3ad65dc7af5bdd350eccecefa05c80ff.tar.gz
- markus@cvs.openbsd.org 2001/04/04 20:25:38
[channels.c channels.h clientloop.c kex.c kex.h serverloop.c sshconnect2.c sshd.c] more robust rekeying don't send channel data after rekeying is started.
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c
index 4ae02fd1..ab7472b7 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.56 2001/04/04 14:34:58 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.57 2001/04/04 20:25:37 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -194,7 +194,7 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
retry_select:
/* Allocate and update select() masks for channel descriptors. */
- channel_prepare_select(readsetp, writesetp, maxfdp);
+ channel_prepare_select(readsetp, writesetp, maxfdp, 0);
if (compat20) {
/* wrong: bad condition XXX */