From a8d3bdb48da71dd65385e4355e46a595ef32dbe0 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Sun, 26 Jun 2011 00:36:25 +0200 Subject: s4 provision: split up DNS provisioning into generic and samba-specific ldifs Signed-off-by: Kai Blin --- source4/scripting/python/samba/provision/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 5aabd36c1a..4b2ce7cd22 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1101,9 +1101,10 @@ def setup_self_join(samdb, names, machinepass, dnspass, "RIDALLOCATIONEND": str(next_rid + 100 + 499), }) - # This is partially Samba4 specific and should be replaced by the correct + setup_ad_dns(samdb, names) + # This is Samba4 specific and should be replaced by the correct # DNS AD-style setup - setup_add_ldif(samdb, setup_path("provision_dns_add.ldif"), { + setup_add_ldif(samdb, setup_path("provision_dns_add_samba.ldif"), { "DNSDOMAIN": names.dnsdomain, "DOMAINDN": names.domaindn, "DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')), @@ -1113,6 +1114,13 @@ def setup_self_join(samdb, names, machinepass, dnspass, }) +def setup_ad_dns(samdb, names): + setup_add_ldif(samdb, setup_path("provision_dns_add.ldif"), { + "DOMAINDN": names.domaindn, + "DNSNAME" : '%s.%s' % ( + names.netbiosname.lower(), names.dnsdomain.lower()) + }) + def getpolicypath(sysvolpath, dnsdomain, guid): """Return the physical path of policy given its guid. -- cgit