nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-23 15:09:24 -05:00
Code Issues Projects Releases Wiki Activity

Finish replacing Network error' with Proxy error' throughout proxy

Browse Source 
code.

[originally from svn r1976]
This commit is contained in:
Simon Tatham 2002-09-24 19:27:58 +00:00
parent 8eae9c513a
commit d7b36aed7f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proxy.c
View File

@ -1005,7 +1005,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
if (p->state == 4) { if (p->state == 4) {
/* TODO: Handle GSSAPI authentication */ /* 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); PROXY_ERROR_GENERAL, 0);
return 1; return 1;
} }
@ -1026,7 +1026,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
sk_write(p->sub_socket, userpwbuf, ulen + plen + 3); sk_write(p->sub_socket, userpwbuf, ulen + plen + 3);
p->state = 7; p->state = 7;
} else } else
plug_closing(p->plug, "Network error: Server chose " plug_closing(p->plug, "Proxy error: Server chose "
"username/password authentication but we " "username/password authentication but we "
"didn't offer it!", "didn't offer it!",
PROXY_ERROR_GENERAL, 0); PROXY_ERROR_GENERAL, 0);
@ -1035,14 +1035,14 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
if (p->state == 6) { if (p->state == 6) {
/* TODO: Handle CHAP authentication */ /* 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); PROXY_ERROR_GENERAL, 0);
return 1; return 1;
} }
} }
plug_closing(p->plug, "Network error: Unexpected proxy error", plug_closing(p->plug, "Proxy error: Unexpected proxy error",
PROXY_ERROR_UNEXPECTED, 0); PROXY_ERROR_UNEXPECTED, 0);
return 1; return 1;
} }
@ -1256,7 +1256,7 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change)
return 1; return 1;
} }
plug_closing(p->plug, "Network error: Unexpected proxy error", plug_closing(p->plug, "Proxy error: Unexpected proxy error",
PROXY_ERROR_UNEXPECTED, 0); PROXY_ERROR_UNEXPECTED, 0);
return 1; return 1;
} }