diff options
| author | Damien Miller <djm@mindrot.org> | 2003-04-09 20:50:06 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-04-09 20:50:06 +1000 |
| commit | a5539d2698ea83b4a7f9abe7cde8306e2fd76f33 (patch) | |
| tree | cd95d1bf54f7496bc080a981bc55300f083939f4 /clientloop.c | |
| parent | a92a589e9716d6b10250c3eb8f4d81d64cd60dd8 (diff) | |
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/04/02 09:48:07
[clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
[readconf.h serverloop.c sshconnect2.c]
reapply rekeying chage, tested by henning@, ok djm@
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index af207c07..a40019d0 100644 --- 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; |