From: Wayne Davison <wayned@samba.org>
Date: Sun, 20 Jun 2004 19:51:19 +0000 (+0000)
Subject: Restored the code in the IPV6_V6ONLY section that checks the
X-Git-Tag: v2.6.3pre1~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd08dc51cb77e9ab796d1bdb5739436c90a6ad4;p=thirdparty%2Frsync.git

Restored the code in the IPV6_V6ONLY section that checks the
return value from setsockopt() with one improvement:  if the
user has used --ipv6 (-6) we don't discard the IPv6 socket.
This should help people using older Linux kernels that don't
implement IPv6 support quite right.
---

diff --git a/socket.c b/socket.c
index 549d40d4..29fb2dcd 100644
--- a/socket.c
+++ b/socket.c
@@ -369,8 +369,12 @@ static int *open_socket_in(int type, int port, const char *bind_address,
 
 #ifdef IPV6_V6ONLY
 		if (resp->ai_family == AF_INET6) {
-			setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
-				   (char *)&one, sizeof one);
+			if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+				       (char *)&one, sizeof one) < 0
+			    && default_af_hint != AF_INET6) {
+				close(s);
+				continue;
+			}
 		}
 #endif