diff options
| author |   markus <markus@openbsd.org> | 2003-04-01 10:22:21 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2003-04-01 10:22:21 +0000 |
| commit | 31dc91d9e0876c715d1fcc8c05de62b5088e12e2 (patch) | |
| tree | fff3c91c3336f791792f7a092d924ce2361c2a4d /usr.bin/ssh/serverloop.c | |
| parent | rekeying bugfixes and automatic rekeying: (diff) | |
| download | wireguard-openbsd-31dc91d9e0876c715d1fcc8c05de62b5088e12e2.tar.xz wireguard-openbsd-31dc91d9e0876c715d1fcc8c05de62b5088e12e2.zip | |
backout rekeying changes (for 3.6.1)
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index f93a9a52c92..6079df5a759 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.105 2003/04/01 10:10:23 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.106 2003/04/01 10:22:21 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -769,14 +769,8 @@ server_loop2(Authctxt *authctxt) &nalloc, 0); collect_children(); - if (!rekeying) { + if (!rekeying) channel_after_select(readset, writeset); - if (packet_need_rekeying()) { - debug("need rekeying"); - xxx_kex->done = 0; - kex_send_kexinit(xxx_kex); - } - } process_input(readset); if (connection_closed) break; |