diff options
| author | Kai Blin <kai@samba.org> | 2011-06-26 00:36:25 +0200 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2011-07-07 00:10:27 +0200 |
| commit | a8d3bdb48da71dd65385e4355e46a595ef32dbe0 (patch) | |
| tree | e8e8f58c1a202ef15e8505fc220270b7edab0278 /source4/scripting | |
| parent | 0b8184d9d40c6ccb10209973e6bbeccee4dc000a (diff) | |
| download | samba-a8d3bdb48da71dd65385e4355e46a595ef32dbe0.tar.gz samba-a8d3bdb48da71dd65385e4355e46a595ef32dbe0.tar.bz2 samba-a8d3bdb48da71dd65385e4355e46a595ef32dbe0.zip | |
s4 provision: split up DNS provisioning into generic and samba-specific ldifs
Signed-off-by: Kai Blin <kai@samba.org>
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 12 |
1 files changed, 10 insertions, 2 deletions
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. |