Import OpenSSH 3.6.1p2.

1 files changed, 11 insertions, 10 deletions

diff --git a/clientloop.c b/clientloop.c
index f07725bbc..af207c070 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.108 2003/04/02 09:48:07 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -490,13 +490,13 @@ process_cmdline(void)
         if (*s == 0)
                 goto out;
         if (strlen(s) < 2 || s[0] != '-' || !(s[1] == 'L' || s[1] == 'R')) {
-                logit("Invalid command.");
+                log("Invalid command.");
                 goto out;
         }
         if (s[1] == 'L')
                 local = 1;
         if (!local && !compat20) {
-                logit("Not supported for SSH protocol version 1.");
+                log("Not supported for SSH protocol version 1.");
                 goto out;
         }
         s += 2;
@@ -507,24 +507,24 @@ process_cmdline(void)
             sfwd_port, buf, sfwd_host_port) != 3 &&
             sscanf(s, "%5[0-9]/%255[^/]/%5[0-9]",
             sfwd_port, buf, sfwd_host_port) != 3) {
-                logit("Bad forwarding specification.");
+                log("Bad forwarding specification.");
                 goto out;
         }
         if ((fwd_port = a2port(sfwd_port)) == 0 ||
             (fwd_host_port = a2port(sfwd_host_port)) == 0) {
-                logit("Bad forwarding port(s).");
+                log("Bad forwarding port(s).");
                 goto out;
         }
         if (local) {
                 if (channel_setup_local_fwd_listener(fwd_port, buf,
                     fwd_host_port, options.gateway_ports) < 0) {
-                        logit("Port forwarding failed.");
+                        log("Port forwarding failed.");
                         goto out;
                 }
         } else
                 channel_request_remote_forwarding(fwd_port, buf,
                     fwd_host_port);
-        logit("Forwarding port.");
+        log("Forwarding port.");
 out:
         signal(SIGINT, handler);
         enter_raw_mode();
@@ -577,7 +577,7 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
                         case 'R':
                                 if (compat20) {
                                         if (datafellows & SSH_BUG_NOREKEY)
-                                                logit("Server does not support re-keying");
+                                                log("Server does not support re-keying");
                                         else
                                                 need_rekeying = 1;
                                 }
@@ -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;