summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-24 19:36:01 +0200
committerStefan Metzmacher <metze@samba.org>2010-04-24 20:30:25 +0200
commitb29f3f497bdcd4830ffbb615ad0dbc9f5d0af53c (patch)
tree76d9fa810c731577758a2ae8f11cf4f8a604ba1c
parent26e6fb0efe461d55e72da637b1b921b77f28af73 (diff)
downloadsamba-b29f3f497bdcd4830ffbb615ad0dbc9f5d0af53c.tar.gz
samba-b29f3f497bdcd4830ffbb615ad0dbc9f5d0af53c.tar.bz2
samba-b29f3f497bdcd4830ffbb615ad0dbc9f5d0af53c.zip
Revert "tsocket: not all systems have IPV6_V6ONLY"
This reverts commit 63fc3978089df403d7e63462593784ff3d05e6e7. We now don't support IPv6 when IPV6_V6ONLY isn't available, as we rely on the behavior. metze
-rw-r--r--lib/tsocket/tsocket_bsd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 220924c715..43defb30c8 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -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;