- markus@cvs.openbsd.org 2001/04/05 20:01:10

     [clientloop.c]
     for ~R print message if server does not support rekeying. (and fix ~R).

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 349f9273b..09086a951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
    - stevesk@cvs.openbsd.org 2001/04/05 15:48:18
      [canohost.c canohost.h session.c]
      move get_remote_name_or_ip() to canohost.[ch]; for portable.  ok markus@
+   - markus@cvs.openbsd.org 2001/04/05 20:01:10
+     [clientloop.c]
+     for ~R print message if server does not support rekeying. (and fix ~R).
 
 20010405
  - OpenBSD CVS Sync                                              
@@ -4898,4 +4901,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1070 2001/04/05 23:32:17 mouring Exp $
+$Id: ChangeLog,v 1.1071 2001/04/05 23:34:29 mouring Exp $
diff --git a/clientloop.c b/clientloop.c
index 41920e0f3..74610c6b1 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.58 2001/04/05 11:09:15 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.59 2001/04/05 20:01:10 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -554,8 +554,12 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
                                 continue;
 
                         case 'R':
-                                if (compat20 && !(datafellows && SSH_BUG_NOREKEY))
-                                        need_rekeying = 1;
+                                if (compat20) {
+                                        if (datafellows & SSH_BUG_NOREKEY)
+                                                log("Server does not support re-keying");
+                                        else
+                                                need_rekeying = 1;
+                                }
                                 continue;
 
                         case '&':