summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-11 17:14:01 +1000
committerAndrew Tridgell <tridge@samba.org>2009-09-11 17:14:01 +1000
commitf009fa15a17d29e41e04eb950bafaea084d2c31d (patch)
tree3c3241330fb1d75145ecf5fd5c5c54d8c65a664b
parent8c58cef875b931cf6655d3b7002ed0a7fe32fe35 (diff)
downloadsamba-f009fa15a17d29e41e04eb950bafaea084d2c31d.tar.gz
samba-f009fa15a17d29e41e04eb950bafaea084d2c31d.tar.bz2
samba-f009fa15a17d29e41e04eb950bafaea084d2c31d.zip
s4-provision: use DNS name, not domain name
The SPNs end in the DNS domain name
-rw-r--r--source4/scripting/python/samba/provision.py1
-rw-r--r--source4/setup/provision_self_join_modify.ldif4
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2495299e62..07dfc62e00 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -801,6 +801,7 @@ 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,
diff --git a/source4/setup/provision_self_join_modify.ldif b/source4/setup/provision_self_join_modify.ldif
index 200fc6c6d9..dfcca728f2 100644
--- a/source4/setup/provision_self_join_modify.ldif
+++ b/source4/setup/provision_self_join_modify.ldif
@@ -31,5 +31,5 @@ interSiteTopologyGenerator: CN=NTDS Settings,${SERVERDN}
dn: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
changetype: modify
add: servicePrincipalName
-servicePrincipalName: E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DOMAIN}
-servicePrincipalName: ldap/${NTDSGUID}._msdcs.${DOMAIN}
+servicePrincipalName: E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN}
+servicePrincipalName: ldap/${NTDSGUID}._msdcs.${DNSDOMAIN}