sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4-provision: fixed detection of V4/V6 addresses

Browse Source 
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Jun  7 06:07:24 CEST 2011 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2011-06-07 12:55:31 +10:00
parent 3ccb72d749
commit 8acbc3a174
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source4/scripting/python/samba/provision/__init__.py
View File

@ -1465,6 +1465,25 @@ def setsysvolacl(samdb, netlogon, sysvol, gid, domainsid, dnsdomain, domaindn,
set_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp)
def interface_ips_v4(lp):
'''return only IPv4 IPs'''
ips = samba.interface_ips(lp, False)
ret = []
for i in ips:
if i.find(':') == -1:
ret.append(i)
return ret
def interface_ips_v6(lp, linklocal=False):
'''return only IPv6 IPs'''
ips = samba.interface_ips(lp, False)
ret = []
for i in ips:
if i.find(':') != -1 and (linklocal or i.find('%') == -1):
ret.append(i)
return ret
def provision(logger, session_info, credentials, smbconf=None,
targetdir=None, samdb_fill=FILL_FULL, realm=None, rootdn=None,
domaindn=None, schemadn=None, configdn=None, serverdn=None,
@ -1565,16 +1584,24 @@ def provision(logger, session_info, credentials, smbconf=None,
if hostip is None:
logger.info("Looking up IPv4 addresses")
hostips = samba.interface_ips(lp, False)
hostips = interface_ips_v4(lp)
if len(hostips) == 0:
logger.warning("No external IPv4 address has been found. Using loopback.")
hostip = '127.0.0.1'
else:
hostip = hostips[0]
if len(hostips) > 1:
logger.warning("More than one IPv4 address found. Using %s.",
logger.warning("More than one IPv4 address found. Using %s",
hostip)
if hostip6 is None:
logger.info("Looking up IPv6 addresses")
hostips = interface_ips_v6(lp, linklocal=False)
if hostips:
hostip6 = hostips[0]
if len(hostips) > 1:
logger.warning("More than one IPv6 address found. Using %s", hostip6)
if serverrole is None:
serverrole = lp.get("server role")