Import OpenSSH 3.6.1p2.

1 files changed, 2 insertions, 8 deletions

diff --git a/serverloop.c b/serverloop.c
index 187afc716..f4df9cccb 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.107 2003/04/02 09:48:07 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.106 2003/04/01 10:22:21 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -771,14 +771,8 @@ 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;