From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 24 Sep 2002 19:27:58 +0000 (+0000)
Subject: Finish replacing `Network error' with `Proxy error' throughout proxy
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/2192a8e4edbdda53506406fca893fe7ca175f716?ds=sidebyside

Finish replacing `Network error' with `Proxy error' throughout proxy
code.


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

diff --git a/proxy.c b/proxy.c
index 7b42622b..2d32d880 100644
--- a/proxy.c
+++ b/proxy.c
@@ -1005,7 +1005,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 
 	if (p->state == 4) {
 	    /* TODO: Handle GSSAPI authentication */
-	    plug_closing(p->plug, "Network error: We don't support GSSAPI authentication",
+	    plug_closing(p->plug, "Proxy error: We don't support GSSAPI authentication",
 			 PROXY_ERROR_GENERAL, 0);
 	    return 1;
 	}
@@ -1026,7 +1026,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 		sk_write(p->sub_socket, userpwbuf, ulen + plen + 3);
 		p->state = 7;
 	    } else 
-		plug_closing(p->plug, "Network error: Server chose "
+		plug_closing(p->plug, "Proxy error: Server chose "
 			     "username/password authentication but we "
 			     "didn't offer it!",
 			 PROXY_ERROR_GENERAL, 0);
@@ -1035,14 +1035,14 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 
 	if (p->state == 6) {
 	    /* TODO: Handle CHAP authentication */
-	    plug_closing(p->plug, "Network error: We don't support CHAP authentication",
+	    plug_closing(p->plug, "Proxy error: We don't support CHAP authentication",
 			 PROXY_ERROR_GENERAL, 0);
 	    return 1;
 	}
 
     }
 
-    plug_closing(p->plug, "Network error: Unexpected proxy error",
+    plug_closing(p->plug, "Proxy error: Unexpected proxy error",
 		 PROXY_ERROR_UNEXPECTED, 0);
     return 1;
 }
@@ -1256,7 +1256,7 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change)
 	return 1;
     }
 
-    plug_closing(p->plug, "Network error: Unexpected proxy error",
+    plug_closing(p->plug, "Proxy error: Unexpected proxy error",
 		 PROXY_ERROR_UNEXPECTED, 0);
     return 1;
 }