summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-08-30 15:18:44 +0200
committerBjoern Jacke <bj@sernet.de>2013-08-30 17:33:58 +0200
commit3430448fc01ce3fbe0606a2c239d3c98a5b78361 (patch)
tree4812f9ac2087b492227b050314975a0fecaaa90f
parent9edc0276c742194ec381c266acedf3216ccf1c69 (diff)
downloadsamba-3430448fc01ce3fbe0606a2c239d3c98a5b78361.tar.gz
samba-3430448fc01ce3fbe0606a2c239d3c98a5b78361.tar.bz2
samba-3430448fc01ce3fbe0606a2c239d3c98a5b78361.zip
python/provision: remove unused linklocal=False argument from interface_ips_v6()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Bjoern Jacke <bj@sernet.de> Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Fri Aug 30 17:33:58 CEST 2013 on sn-devel-104
-rw-r--r--python/samba/provision/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index a84b92ff49..89f029a2af 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1705,12 +1705,12 @@ def interface_ips_v4(lp):
return ret
-def interface_ips_v6(lp, linklocal=False):
+def interface_ips_v6(lp):
"""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):
+ if i.find(':') != -1:
ret.append(i)
return ret
@@ -2007,7 +2007,7 @@ def provision(logger, session_info, credentials, smbconf=None,
if hostip6 is None:
logger.info("Looking up IPv6 addresses")
- hostips = interface_ips_v6(lp, linklocal=False)
+ hostips = interface_ips_v6(lp)
if hostips:
hostip6 = hostips[0]
if len(hostips) > 1: