summaryrefslogtreecommitdiffstats
path: root/python/samba/provision/sambadns.py
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2014-06-10 15:35:47 +0200
committerMichael Adam <obnox@samba.org>2014-06-18 14:07:11 +0200
commit4ebd7250ef18811e58d812670e96e61836e4770b (patch)
treefccd132348bcd3d899a41005feefd1b101aa57bc /python/samba/provision/sambadns.py
parent937d35bd182a7dfb0845bc4e418ea7982538f55f (diff)
downloadsamba-4ebd7250ef18811e58d812670e96e61836e4770b.tar.gz
samba-4ebd7250ef18811e58d812670e96e61836e4770b.tar.xz
samba-4ebd7250ef18811e58d812670e96e61836e4770b.zip
provision/sambadns: remove redundant site parameter
The sitename is already included in "names" parameter. Signed-off-by: Björn Baumbach <bb@sernet.de> Reviewed-by: Michael Adam <obnox@samba.org> Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
Diffstat (limited to 'python/samba/provision/sambadns.py')
-rw-r--r--python/samba/provision/sambadns.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index f1cb1e2660..87fb486304 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -1035,7 +1035,7 @@ def fill_dns_data_partitions(samdb, domainsid, site, domaindn, forestdn,
def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
- dns_backend, os_level, site, dnspass=None, hostip=None, hostip6=None,
+ dns_backend, os_level, dnspass=None, hostip=None, hostip6=None,
targetdir=None, fill_level=FILL_FULL):
"""Provision DNS information (assuming GC role)
@@ -1048,7 +1048,6 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
:param logger: Logger object
:param dns_backend: Type of DNS backend
:param os_level: Functional level (treated as os level)
- :param site: Site to create hostnames in
:param dnspass: Password for bind's DNS account
:param hostip: IPv4 address
:param hostip6: IPv6 address
@@ -1090,6 +1089,8 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
dnsdomain = names.dnsdomain.lower()
dnsforest = dnsdomain
+ site = names.sitename
+
hostname = names.netbiosname.lower()
dnsadmins_sid = get_dnsadmins_sid(samdb, domaindn)