From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 21 Jan 2007 23:34:51 +0000 (+0000)
Subject: Fix several bugs that stopped %proxyport from doing anything useful.
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/3d291a547e2ad9fa88c13e9cb6eb1f38976471bc

Fix several bugs that stopped %proxyport from doing anything useful.


git-svn-id: svn://svn.tartarus.org/sgt/putty@7133 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/proxy.c b/proxy.c
index ad3b8146..c6008a59 100644
--- a/proxy.c
+++ b/proxy.c
@@ -1369,7 +1369,7 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
 		eo += 4;
 	    }
 	    else if (strnicmp(cfg->proxy_telnet_command + eo,
-			      "proxyhost", 4) == 0) {
+			      "proxyhost", 9) == 0) {
 		int phlen = strlen(cfg->proxy_host);
 		ENSURE(phlen);
 		memcpy(ret+retlen, cfg->proxy_host, phlen);
@@ -1377,11 +1377,11 @@ char *format_telnet_command(SockAddr addr, int port, const Config *cfg)
 		eo += 9;
 	    }
 	    else if (strnicmp(cfg->proxy_telnet_command + eo,
-			      "proxyport", 4) == 0) {
+			      "proxyport", 9) == 0) {
                 char pport[50];
 		int pplen;
                 sprintf(pport, "%d", cfg->proxy_port);
-                pplen = strlen(cfg->proxy_host);
+                pplen = strlen(pport);
 		ENSURE(pplen);
 		memcpy(ret+retlen, pport, pplen);
 		retlen += pplen;