X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fconnect.c;h=bfb079b78b544b242ae68302edd18a2db093fcbb;hp=6eca1ded24464daf542c5b41281d30c8eea51614;hb=38a7829dcb4eb5dba28dbf0f05c6a80fea9217f8;hpb=2b1dd8d23b987a82d03cfa803aabcb02f80e1066

diff --git a/src/connect.c b/src/connect.c
index 6eca1ded..bfb079b7 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -36,13 +36,8 @@ as that of the covered work.  */
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* def HAVE_SYS_SOCKET_H */
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif /* def HAVE_SYS_SELECT_H */
+#include <sys/socket.h>
+#include <sys/select.h>
 
 #ifndef WINDOWS
 # ifdef __VMS
@@ -299,8 +294,10 @@ connect_to_ip (const ip_address *ip, int port, const char *print)
        {
            if (ip->family == AF_INET)
                logprintf (LOG_VERBOSE, _("Connecting to %s:%d... "), txt_addr, port);
+#ifdef ENABLE_IPV6
            else if (ip->family == AF_INET6)
                logprintf (LOG_VERBOSE, _("Connecting to [%s]:%d... "), txt_addr, port);
+#endif
        }
     }
 
@@ -562,6 +559,7 @@ socket_ip_address (int sock, ip_address *ip, int endpoint)
   if (ret < 0)
     return false;
 
+  memset(ip, 0, sizeof(ip_address));
   ip->family = sockaddr->sa_family;
   switch (sockaddr->sa_family)
     {