1 files changed, 8 insertions, 4 deletions

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 3a0dc2653..ee54898e3 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -98,15 +98,15 @@ len_and_sockaddr* FAST_FUNC get_peer_lsa(int fd)
         return get_lsa(fd, getpeername);
 }
 
-void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
+void FAST_FUNC xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen)
 {
-        if (connect(s, s_addr, addrlen) < 0) {
+        if (connect(s, saddr, addrlen) < 0) {
                 if (ENABLE_FEATURE_CLEAN_UP)
                         close(s);
-                if (s_addr->sa_family == AF_INET)
+                if (saddr->sa_family == AF_INET)
                         bb_perror_msg_and_die("%s (%s)",
                                 "can't connect to remote host",
-                                inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
+                                inet_ntoa(((struct sockaddr_in *)saddr)->sin_addr));
                 bb_perror_msg_and_die("can't connect to remote host");
         }
 }
@@ -353,6 +353,10 @@ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, int family, int sock_type)
 #if ENABLE_FEATURE_IPV6
                 fd = socket(AF_INET6, sock_type, 0);
                 if (fd >= 0) {
+#if ENABLE_PLATFORM_MINGW32
+                        DWORD buffer = 0;
+                        setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &buffer, sizeof(DWORD));
+#endif
                         family = AF_INET6;
                         goto done;
                 }