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>

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 0acd6f434089e1d5774ccffed5d31ad2307c8a6b..477c5ddc4b91573c519f96dd1f9a5333ac80adf2 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1826,7 +1826,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
         setup_ad_dns(samdb, secrets_ldb, domainsid, names, paths, lp, logger,
                      hostip=hostip, hostip6=hostip6, dns_backend=dns_backend,
                      dnspass=dnspass, os_level=dom_for_fun_level,
-                     targetdir=targetdir, site=DEFAULTSITE, fill_level=samdb_fill)
+                     targetdir=targetdir, fill_level=samdb_fill)
 
         domainguid = samdb.searchone(basedn=samdb.get_default_basedn(),
                                      attribute="objectGUID")

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index f1cb1e2660a92e3add6ccecb017629b2e70bc811..87fb48630488960df1856b11d5336f43aa6da3a1 100644 (file)
--- 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)