summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-04-04 20:25:35 +0000
committermarkus <markus@openbsd.org>2001-04-04 20:25:35 +0000
commitd53226a6d73036aba092334710033cab4c0edcfb (patch)
tree6102e7d928aced68da5e5122208f0962f7ab3d8b /usr.bin/ssh/serverloop.c
parentDocument softdep option. (diff)
downloadwireguard-openbsd-d53226a6d73036aba092334710033cab4c0edcfb.tar.xz
wireguard-openbsd-d53226a6d73036aba092334710033cab4c0edcfb.zip
more robust rekeying
don't send channel data after rekeying is started.
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index b1948611299..95592be7da6 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/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 */