summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-11-04 08:45:49 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-11-10 01:11:46 +0100
commitca52871541bb0303e1b07b7c105424f67bd1c804 (patch)
treef59ca29af6274da0cb3e7d4b437924dfbc3b321d /source4/setup
parent0f2ff7c5c23490adc8c1b7287f8f52dddcf48e15 (diff)
downloadsamba-ca52871541bb0303e1b07b7c105424f67bd1c804.tar.gz
samba-ca52871541bb0303e1b07b7c105424f67bd1c804.tar.bz2
samba-ca52871541bb0303e1b07b7c105424f67bd1c804.zip
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
Diffstat (limited to 'source4/setup')
-rw-r--r--source4/setup/provision_dns_add_samba.ldif1
-rw-r--r--source4/setup/secrets_dns.ldif1
2 files changed, 0 insertions, 2 deletions
diff --git a/source4/setup/provision_dns_add_samba.ldif b/source4/setup/provision_dns_add_samba.ldif
index 6c664d910b..7fb2e78961 100644
--- 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 641bce6382..67fd66b057 100644
--- 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}