Revert "tsocket: not all systems have IPV6_V6ONLY"
authorStefan Metzmacher <metze@samba.org>
Sat, 24 Apr 2010 17:36:01 +0000 (19:36 +0200)
committerStefan Metzmacher <metze@samba.org>
Sat, 24 Apr 2010 18:30:25 +0000 (20:30 +0200)
This reverts commit 63fc3978089df403d7e63462593784ff3d05e6e7.

We now don't support IPv6 when IPV6_V6ONLY isn't available,
as we rely on the behavior.

metze

lib/tsocket/tsocket_bsd.c

index 220924c715f7489d8e2057eee4aa501b205862d6..43defb30c809d30b6c3c00d52ee61ecf411738c0 100644 (file)
@@ -1206,7 +1206,7 @@ static int tdgram_bsd_dgram_socket(const struct tsocket_address *local,
        bsds->fd = fd;
        talloc_set_destructor(bsds, tdgram_bsd_destructor);
 
-#if defined(HAVE_IPV6) && defined(IPV6_V6ONLY)
+#ifdef HAVE_IPV6
        if (do_ipv6only) {
                int val = 1;
 
@@ -2037,7 +2037,7 @@ static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
                goto post;
        }
 
-#if defined(HAVE_IPV6) && defined(IPV6_V6ONLY)
+#ifdef HAVE_IPV6
        if (do_ipv6only) {
                int val = 1;