X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=proxy.c;h=c6008a59d095c4336594352d51cf76848597ad40;hb=12e019bafc75cb441e965c63e15dfceeaf71ca1e;hp=a27c38ee5775f0e41ed0e79429105ca07392f014;hpb=f70efc5cc6ae0e86b3354ec4ef71ea04bd0d84d9;p=PuTTY.git

diff --git a/proxy.c b/proxy.c
index a27c38ee..c6008a59 100644
--- a/proxy.c
+++ b/proxy.c
@@ -16,9 +16,7 @@
 
 #define do_proxy_dns(cfg) \
     (cfg->proxy_dns == FORCE_ON || \
-	 (cfg->proxy_dns == AUTO && \
-              cfg->proxy_type != PROXY_SOCKS4 && \
-              cfg->proxy_type != PROXY_SOCKS5))
+	 (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS4))
 
 /*
  * Call this when proxy negotiation is complete, so that this
@@ -1371,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);
@@ -1379,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;