s4-setup Remove servicePrincipalName: DNS/${DNSDOMAIN} from new installations

This servicePrincipalName is incorrect (windows does not use that
servicePrincipalName, as it targets the server it is updating, not the
root of the DNS tree), and now that we have multiple DNS backends that
use the internal database, it is quite incorrect (as it cannot exist
on more than one account).

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Nov 10 01:11:46 CET 2011 on sn-devel-104

diff --git a/source4/setup/provision_dns_add_samba.ldif b/source4/setup/provision_dns_add_samba.ldif
index 6c664d910b32f4842d8b1a3bab211b4900908eec..7fb2e7896158dee181e66411811c11ac3100f067 100644 (file)
--- a/source4/setup/provision_dns_add_samba.ldif
+++ b/source4/setup/provision_dns_add_samba.ldif
@@ -12,6 +12,5 @@ userAccountControl: 512
 accountExpires: 9223372036854775807
 sAMAccountName: dns-${HOSTNAME}
 servicePrincipalName: DNS/${DNSNAME}
-servicePrincipalName: DNS/${DNSDOMAIN}
 clearTextPassword:: ${DNSPASS_B64}
 isCriticalSystemObject: TRUE

diff --git a/source4/setup/secrets_dns.ldif b/source4/setup/secrets_dns.ldif
index 641bce6382d27449a1f5a132e5bdd3700a6c71bd..67fd66b0570671b2df633515459252f47adf0186 100644 (file)
--- a/source4/setup/secrets_dns.ldif
+++ b/source4/setup/secrets_dns.ldif
@@ -4,7 +4,6 @@ objectClass: top
 objectClass: secret
 objectClass: kerberosSecret
 realm: ${REALM}
-servicePrincipalName: DNS/${DNSDOMAIN}
 servicePrincipalName: DNS/${DNSNAME}
 msDS-KeyVersionNumber: 1
 privateKeytab: ${DNS_KEYTAB}