diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 10 |
2 files changed, 11 insertions, 4 deletions
@@ -26,6 +26,9 @@ | |||
26 | - stevesk@cvs.openbsd.org 2001/04/05 15:48:18 | 26 | - stevesk@cvs.openbsd.org 2001/04/05 15:48:18 |
27 | [canohost.c canohost.h session.c] | 27 | [canohost.c canohost.h session.c] |
28 | move get_remote_name_or_ip() to canohost.[ch]; for portable. ok markus@ | 28 | move get_remote_name_or_ip() to canohost.[ch]; for portable. ok markus@ |
29 | - markus@cvs.openbsd.org 2001/04/05 20:01:10 | ||
30 | [clientloop.c] | ||
31 | for ~R print message if server does not support rekeying. (and fix ~R). | ||
29 | 32 | ||
30 | 20010405 | 33 | 20010405 |
31 | - OpenBSD CVS Sync | 34 | - OpenBSD CVS Sync |
@@ -4898,4 +4901,4 @@ | |||
4898 | - Wrote replacements for strlcpy and mkdtemp | 4901 | - Wrote replacements for strlcpy and mkdtemp |
4899 | - Released 1.0pre1 | 4902 | - Released 1.0pre1 |
4900 | 4903 | ||
4901 | $Id: ChangeLog,v 1.1070 2001/04/05 23:32:17 mouring Exp $ | 4904 | $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 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.58 2001/04/05 11:09:15 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.59 2001/04/05 20:01:10 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -554,8 +554,12 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) | |||
554 | continue; | 554 | continue; |
555 | 555 | ||
556 | case 'R': | 556 | case 'R': |
557 | if (compat20 && !(datafellows && SSH_BUG_NOREKEY)) | 557 | if (compat20) { |
558 | need_rekeying = 1; | 558 | if (datafellows & SSH_BUG_NOREKEY) |
559 | log("Server does not support re-keying"); | ||
560 | else | ||
561 | need_rekeying = 1; | ||
562 | } | ||
559 | continue; | 563 | continue; |
560 | 564 | ||
561 | case '&': | 565 | case '&': |