From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sat, 8 Nov 2014 18:35:31 +0000 (+0000)
Subject: Tweak SSH protocol version refusal messages.
X-Git-Tag: 0.64~32
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=efb6aa4642055383910891f201301298a6bea498;p=PuTTY.git

Tweak SSH protocol version refusal messages.

"required by user" will grate if the user did not configure the
behaviour (and I'm about to change the default to `2 only').
---

diff --git a/ssh.c b/ssh.c
index d395d7b5..959025c4 100644
--- a/ssh.c
+++ b/ssh.c
@@ -2960,11 +2960,13 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
     s->proto2 = ssh_versioncmp(s->version, "1.99") >= 0;
 
     if (conf_get_int(ssh->conf, CONF_sshprot) == 0 && !s->proto1) {
-	bombout(("SSH protocol version 1 required by user but not provided by server"));
+	bombout(("SSH protocol version 1 required by configuration but "
+		 "not provided by server"));
 	crStop(0);
     }
     if (conf_get_int(ssh->conf, CONF_sshprot) == 3 && !s->proto2) {
-	bombout(("SSH protocol version 2 required by user but not provided by server"));
+	bombout(("SSH protocol version 2 required by configuration but "
+		 "not provided by server"));
 	crStop(0);
     }