From 25ac58dccef5d1da9946aeb191d6b6c4ee8782cf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 6 Jun 2011 10:42:28 +1000
Subject: s4-ipv6: fix the address family for IPv6 string addresses

---
 source4/lib/socket/socket.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4')

diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 41638b3d72..369cf5ff36 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -473,6 +473,11 @@ _PUBLIC_ struct socket_address *socket_address_from_strings(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
+	if (strcmp(family, "ip") == 0 && is_ipaddress_v6(host)) {
+		/* leaving as "ip" would force IPv4 */
+		family = "ipv6";
+	}
+
 	addr->family = family;
 	addr->addr = talloc_strdup(addr, host);
 	if (!addr->addr) {
-- 
cgit