Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10

This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.

Karolin

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 4acc24b699d..53f10826080 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -986,7 +986,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):
     """Provision DNS information (assuming GC role)
 
@@ -999,7 +999,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
@@ -1041,6 +1040,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)