s4-provision: use DNS name, not domain name

The SPNs end in the DNS domain name

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2495299e626469547fed854fc49d61a1558a8efc..07dfc62e009c84905f16a6fd9af2a8ad1d04d6c2 100644 (file)
--- 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 200fc6c6d910f77d0da4d73f10ae30da9ad0ee6a..dfcca728f2f4cb10e918cd41d4d221e2421311fa 100644 (file)
--- 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}