summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2003-04-02 09:48:07 +0000
committermarkus <markus@openbsd.org>2003-04-02 09:48:07 +0000
commitbe896bcfd9a2b8258048edad3d5d8a434f57a68e (patch)
treec76c55cd62ed3c1813fe1694bfcf6165aea0f672 /usr.bin/ssh/serverloop.c
parentHewlett Packard -> Hewlett-Packard (diff)
downloadwireguard-openbsd-be896bcfd9a2b8258048edad3d5d8a434f57a68e.tar.xz
wireguard-openbsd-be896bcfd9a2b8258048edad3d5d8a434f57a68e.zip
reapply rekeying chage, tested by henning@, ok djm@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 6079df5a759..0e41a7580f3 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.106 2003/04/01 10:22:21 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.107 2003/04/02 09:48:07 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -769,8 +769,14 @@ 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;