summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-04-05 20:01:11 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-04-05 20:01:11 +0000
commit07e72198eed7888a38ff962b06afc2a5131a9641 (patch)
tree7461c7ffb1f3bbb377202e3ab96e7176218d2a2b /usr.bin
parentc286f8821fd8e14c2fd63913ec0fef8b7eeecfe4 (diff)
for ~R print message if server does not support rekeying. (and fix ~R).
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/clientloop.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 41920e0f364..74610c6b188 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.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 '&':