diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-08-30 15:18:44 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-09-02 11:50:45 +0200 |
| commit | bfd3cc399641b251ce1076f99068b6af46f5b89c (patch) | |
| tree | 0e749ae5e29fa52258cf689d38e88fe39e4836a1 /python | |
| parent | 21708c19b56adfb3df19187d4e6566f0a1e87df3 (diff) | |
| download | samba-bfd3cc399641b251ce1076f99068b6af46f5b89c.tar.gz | |
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
(cherry picked from commit 3430448fc01ce3fbe0606a2c239d3c98a5b78361)
The last 3 patches address bug #10030 - ::1 added to nameserver on join.
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Mon Sep 2 11:50:45 CEST 2013 on sn-devel-104
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/provision/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index a84b92ff49d..89f029a2afc 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: |