s4-provision: don't try to look for an IPv6 address when not specified
authorAndrew Tridgell <tridge@samba.org>
Thu, 25 Nov 2010 23:20:03 +0000 (10:20 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 26 Nov 2010 02:08:21 +0000 (03:08 +0100)
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 <abartlet@samba.org>

source4/scripting/python/samba/provision.py

index cb1e8bd3ee23ea97ac17d4b6b25ae202223a4cf3..b6c39cbb66ffdacc59f0c8c11f1a0e806f5cb93d 100644 (file)
@@ -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")