diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-09-19 20:40:17 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-09-20 16:29:37 -0700 |
| commit | 509a2bb97c5ccb13c4c2f885f3961f2880aceb91 (patch) | |
| tree | a5f84fafb1447ad505adf41920ef32c6121ff844 /source4/scripting/python | |
| parent | 11bfbc516077d1cead94d0bc70ef24267b9014e7 (diff) | |
| download | samba-509a2bb97c5ccb13c4c2f885f3961f2880aceb91.tar.gz samba-509a2bb97c5ccb13c4c2f885f3961f2880aceb91.tar.bz2 samba-509a2bb97c5ccb13c4c2f885f3961f2880aceb91.zip | |
s4:provision split provision of DNS zone and self join keytab
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index fe11b94d67..68a50b2e37 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -669,7 +669,14 @@ def secretsdb_become_dc(secretsdb, setup_path, domain, realm, dnsdomain, :param setup_path: Setup path function :param machinepass: Machine password """ - setup_ldb(secretsdb, setup_path("secrets_dc.ldif"), { + setup_ldb(secretsdb, setup_path("secrets_dns.ldif"), { + "REALM": realm, + "DNSDOMAIN": dnsdomain, + "DNS_KEYTAB": dns_keytab_path, + "DNSPASS_B64": b64encode(dnspass), + }) + + setup_ldb(secretsdb, setup_path("secrets_self_join.ldif"), { "MACHINEPASS_B64": b64encode(machinepass), "DOMAIN": domain, "REALM": realm, @@ -677,9 +684,8 @@ def secretsdb_become_dc(secretsdb, setup_path, domain, realm, dnsdomain, "DOMAINSID": str(domainsid), "SECRETS_KEYTAB": keytab_path, "NETBIOSNAME": netbiosname, - "SAM_LDB": samdb_url, - "DNS_KEYTAB": dns_keytab_path, - "DNSPASS_B64": b64encode(dnspass), + "SALT_PRINCIPAL": "host/%s.%s@%s" % (netbiosname.lower(), dnsdomain.lower(), realm.upper()), + "KEY_VERSION_NUMBER": "1" }) |