X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=proxy.c;h=f3342495e0bd75732d4f58bbe3eab3dfc4ba5840;hb=b4e7ec8b12e19895ea509653090c43a5a1c52ed1;hp=be238c34d38ce1916ceb07fa9e6f1b8d870eba6f;hpb=952857fca38ee6f3b7307fefebbd766756b2e2e5;p=PuTTY.git

diff --git a/proxy.c b/proxy.c
index be238c34..f3342495 100644
--- a/proxy.c
+++ b/proxy.c
@@ -15,8 +15,8 @@
 #include "proxy.h"
 
 #define do_proxy_dns(cfg) \
-    (cfg->proxy_dns == 2 || \
-	 (cfg->proxy_dns == 1 && cfg->proxy_type != PROXY_SOCKS))
+    (cfg->proxy_dns == FORCE_ON || \
+	 (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS))
 
 /*
  * Call this when proxy negotiation is complete, so that this
@@ -281,7 +281,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 
     while (exclude_list[s]) {
 	while (exclude_list[s] &&
-	       (isspace(exclude_list[s]) ||
+	       (isspace((unsigned char)exclude_list[s]) ||
 		exclude_list[s] == ',')) s++;
 
 	if (!exclude_list[s]) break;
@@ -289,7 +289,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 	e = s;
 
 	while (exclude_list[e] &&
-	       (isalnum(exclude_list[e]) ||
+	       (isalnum((unsigned char)exclude_list[e]) ||
 		exclude_list[e] == '-' ||
 		exclude_list[e] == '.' ||
 		exclude_list[e] == '*')) e++;
@@ -325,7 +325,7 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port,
 
 	/* Make sure we really have reached the next comma or end-of-string */
 	while (exclude_list[s] &&
-	       !isspace(exclude_list[s]) &&
+	       !isspace((unsigned char)exclude_list[s]) &&
 	       exclude_list[s] != ',') s++;
     }