first pass

[PuTTY.git] / proxy.c

diff --git a/proxy.c b/proxy.c
index 5b77bc7670b1844a273c1693042502ebf39672e6..52006794cb9753b8af0c1bea554c0d3045c9890c 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -518,7 +518,7 @@ Socket new_connection(SockAddr addr, const char *hostname,
 
         {
             char addrbuf[256], *logmsg;
-            sk_getaddr(addr, addrbuf, lenof(addrbuf));
+            sk_getaddr(proxy_addr, addrbuf, lenof(addrbuf));
             logmsg = dupprintf("Connecting to %s proxy at %s port %d",
                                proxy_type, addrbuf,
                                conf_get_int(conf, CONF_proxy_port));
@@ -1246,9 +1246,11 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
                char userpwbuf[255 + 255 + 3];
                int ulen, plen;
                ulen = strlen(username);
-               if (ulen > 255) ulen = 255; if (ulen < 1) ulen = 1;
+               if (ulen > 255) ulen = 255;
+               if (ulen < 1) ulen = 1;
                plen = strlen(password);
-               if (plen > 255) plen = 255; if (plen < 1) plen = 1;
+               if (plen > 255) plen = 255;
+               if (plen < 1) plen = 1;
                userpwbuf[0] = 1;      /* version number of subnegotiation */
                userpwbuf[1] = ulen;
                memcpy(userpwbuf+2, username, ulen);