rm some magic numbers in ssh_setup_portfwd()

[PuTTY.git] / windows / winnet.c

diff --git a/windows/winnet.c b/windows/winnet.c
index f6f7bab05916d3be99bd5258a68e0087433782d7..85e7d0c9560ee88291d52dc3b3a82d58072a301c 100644 (file)
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -251,8 +251,10 @@ void sk_cleanup(void)
     p_WSACleanup();
     if (winsock_module)
        FreeLibrary(winsock_module);
+#ifndef NO_IPV6
     if (wship6_module)
        FreeLibrary(wship6_module);
+#endif
 }
 
 char *winsock_error_string(int error)
@@ -351,6 +353,9 @@ SockAddr sk_namelookup(const char *host, char **canonicalname,
                   address_family == ADDRTYPE_IPV6 ? AF_INET6 :
 #endif
                   AF_UNSPEC);
+#ifndef NO_IPV6
+    ret->ai = ret->ais = NULL;
+#endif
     ret_family = AF_UNSPEC;
     *realhost = '\0';
 
@@ -454,6 +459,10 @@ SockAddr sk_nonamelookup(const char *host)
     SockAddr ret = snew(struct SockAddr_tag);
     ret->error = NULL;
     ret->family = AF_UNSPEC;
+#ifndef NO_IPV6
+    ret->ai = ret->ais = NULL;
+#endif
+    ret->naddresses = 0;
     strncpy(ret->hostname, host, lenof(ret->hostname));
     ret->hostname[lenof(ret->hostname)-1] = '\0';
     return ret;