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/clientloop.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/clientloop.c')
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 846eeeee139..af207c070b3 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.106 2003/04/01 10:10:23 markus Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -968,8 +968,9 @@ 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 || packet_need_rekeying()) { - debug("need rekeying"); + + if (need_rekeying) { + debug("user requests rekeying"); xxx_kex->done = 0; kex_send_kexinit(xxx_kex); need_rekeying = 0; |