diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/provision/__init__.py | 2 | ||||
| -rw-r--r-- | python/samba/provision/sambadns.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 0acd6f4340..477c5ddc4b 100644 --- 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 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) |