Rene Post's other patch: PuTTYgen was generating double file dialogs

[sgt/putty] / proxy.c

diff --git a/proxy.c b/proxy.c
index 11054df..2c0554a 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -234,7 +234,7 @@ static void plug_proxy_sent (Plug p, int bufsize)
     plug_sent(ps->plug, bufsize);
 }
 
-static int plug_proxy_accepting (Plug p, void *sock)
+static int plug_proxy_accepting (Plug p, OSSocket sock)
 {
     Proxy_Plug pp = (Proxy_Plug) p;
     Proxy_Socket ps = pp->proxy_socket;
@@ -387,8 +387,9 @@ Socket new_connection(SockAddr addr, char *hostname,
        char *proxy_canonical_name;
        Socket sret;
 
-       if ( (sret = platform_new_connection(addr, hostname, port, privport,
-                                            oobinline, nodelay, plug, cfg)) )
+       if ((sret = platform_new_connection(addr, hostname, port, privport,
+                                           oobinline, nodelay, plug, cfg)) !=
+           NULL)
            return sret;
 
        ret = snew(struct Socket_proxy_tag);