summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-10-31 14:00:14 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-10-31 18:44:07 +0000
commit572774a7a0a1c646bc84d1310f5e8002a464216c (patch)
treedb3d341a45edbec9470ecb2dad0f318766e4d2dc /source4/scripting
parent01e7cc607cfdfb3b0b17048a30b470ac990ba736 (diff)
downloadsamba-572774a7a0a1c646bc84d1310f5e8002a464216c.tar.gz
samba-572774a7a0a1c646bc84d1310f5e8002a464216c.tar.bz2
samba-572774a7a0a1c646bc84d1310f5e8002a464216c.zip
s4:provision - remove the "servicePrincipalName" creation on the DC object
This is now done by the "samba_spnupdate" script.
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 319b63debb..441c2b540b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -954,14 +954,10 @@ def setup_self_join(samdb, names,
"SERVERDN": names.serverdn,
"INVOCATIONID": invocationid,
"NETBIOSNAME": names.netbiosname,
- "DEFAULTSITE": names.sitename,
"DNSNAME": "%s.%s" % (names.hostname, names.dnsdomain),
"MACHINEPASS_B64": b64encode(machinepass),
- "REALM": names.realm,
- "DOMAIN": names.domain,
"DOMAINSID": str(domainsid),
"DCRID": str(next_rid),
- "DNSDOMAIN": names.dnsdomain,
"SAMBA_VERSION_STRING": version,
"NTDSGUID": ntdsguid_line,
"DOMAIN_CONTROLLER_FUNCTIONALITY": str(domainControllerFunctionality)})
@@ -970,7 +966,6 @@ def setup_self_join(samdb, names,
"POLICYGUID": policyguid,
"POLICYGUID_DC": policyguid_dc,
"DNSDOMAIN": names.dnsdomain,
- "DOMAINSID": str(domainsid),
"DOMAINDN": names.domaindn})
# add the NTDSGUID based SPNs
@@ -981,15 +976,12 @@ def setup_self_join(samdb, names,
# Setup fSMORoleOwner entries to point at the newly created DC entry
setup_modify_ldif(samdb, setup_path("provision_self_join_modify.ldif"), {
- "DOMAIN": names.domain,
- "DNSDOMAIN": names.dnsdomain,
"DOMAINDN": names.domaindn,
"CONFIGDN": names.configdn,
"SCHEMADN": names.schemadn,
"DEFAULTSITE": names.sitename,
"SERVERDN": names.serverdn,
"NETBIOSNAME": names.netbiosname,
- "NTDSGUID": names.ntdsguid,
"RIDALLOCATIONSTART": str(next_rid + 100),
"RIDALLOCATIONEND": str(next_rid + 100 + 499),
})