- (djm) OpenBSD CVS Sync

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index af207c070b37826424b42eeefb2c627345744e0c..a40019d08d09b6d7e61e20fe96faa0a18fb750a9 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.108 2003/04/02 09:48:07 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -968,9 +968,8 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                /* Do channel operations unless rekeying in progress. */
                if (!rekeying) {
                        channel_after_select(readset, writeset);
-
-                       if (need_rekeying) {
-                               debug("user requests rekeying");
+                       if (need_rekeying || packet_need_rekeying()) {
+                               debug("need rekeying");
                                xxx_kex->done = 0;
                                kex_send_kexinit(xxx_kex);
                                need_rekeying = 0;