sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-16 20:59:12 +03:00
Code Activity

s4:provision - remove the "servicePrincipalName" creation on the DC object

Browse Source 
This is now done by the "samba_spnupdate" script.
This commit is contained in:
Matthias Dieter Wallnöfer
2010-10-31 14:00:14 +01:00
parent 01e7cc607c
commit 572774a7a0
3 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/scripting/python/samba/provision.py
View File

@ -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),
})