From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 15 Jan 2008 11:54:15 +0000 (+0000)
Subject: fixup test for BSD.
X-Git-Tag: release-0.9~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8404701a09fc66b9580f0aaa4dc6473917e80701;p=thirdparty%2Funbound.git

fixup test for BSD.


git-svn-id: file:///svn/unbound/trunk@851 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 5d514c898..2ecc4833e 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -246,6 +246,16 @@ set_ip6_recvpktinfo(int s)
 			strerror(errno));
 		return 0;
 	}
+#ifdef IPV6_V6ONLY
+	on = 0;
+	if(setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+		&on, (socklen_t)sizeof(on)) < 0) {
+		log_err("disable sockopt(..., IPV6_V6ONLY, ...) failed: %s"
+			" (on BSD may be due to net.inet6.ip6.v6only sysctl)",
+			strerror(errno));
+		return 0;
+	}
+#endif /* defined IPV6_V6ONLY */
 	return 1;
 }
 #endif /* defined IPV6_RECVPKTINFO */
diff --git a/testdata/fwd_ancil.tpkg b/testdata/fwd_ancil.tpkg
index e8eaac0ed..42d229bc2 100644
Binary files a/testdata/fwd_ancil.tpkg and b/testdata/fwd_ancil.tpkg differ