From eeb29b593a671e16f87e64f01abea47ec898ba77 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 26 Nov 2010 10:20:03 +1100 Subject: s4-provision: don't try to look for an IPv6 address when not specified the getaddrinfo() method of finding an IPv6 address is incorrect. We could do it via the Samba interfaces code, but until we have that it is better to not try to auto-detect IPv6 Pair-Programmed-With: Andrew Bartlett --- source4/scripting/python/samba/provision.py | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index cb1e8bd3ee..b6c39cbb66 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1484,17 +1484,6 @@ def provision(setup_dir, logger, session_info, if len(hostips) > 1: logger.warning("More than one IPv4 address found. Using %s.", hostip) - if hostip6 is None: - try: - logger.info("Looking up IPv6 address for %s" % names.hostname) - for ip in socket.getaddrinfo(names.hostname, None, socket.AF_INET6, socket.AI_CANONNAME, socket.IPPROTO_IP): - if hostip6 is None: - hostip6 = ip[-1][0] - if hostip6 == '::1' and ip[-1][0] != '::1': - hostip6 = ip[-1][0] - except socket.gaierror, (socket.EAI_NODATA, msg): - hostip6 = None - if serverrole is None: serverrole = lp.get("server role") -- cgit