From a46f89d5e684b45d5c5f6f4319dabb5f0b4a520c Mon Sep 17 00:00:00 2001
From: Markus Friedl <markus@cvs.openbsd.org>
Date: Wed, 2 Apr 2003 09:48:08 +0000
Subject: reapply rekeying chage, tested by henning@, ok djm@

---
 usr.bin/ssh/clientloop.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'usr.bin/ssh/clientloop.c')

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index af207c070b3..a40019d08d0 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/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;
-- 
cgit v1.2.3