summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-08-24 15:48:02 +1000
committerAndrew Tridgell <tridge@samba.org>2011-08-25 07:39:39 +1000
commitb2c6b0122f88767abd6685117066c793e8191b6f (patch)
treed1d5a3ca2b77da2b01447a61a8747234734ba4a2
parent08b2aa08433d4e4be9764f926fdbec455df3a8ea (diff)
downloadsamba-b2c6b0122f88767abd6685117066c793e8191b6f.tar.gz
samba-b2c6b0122f88767abd6685117066c793e8191b6f.tar.bz2
samba-b2c6b0122f88767abd6685117066c793e8191b6f.zip
s4-dns: fixed dns_update_list for multi-domain forests
this should now match the DNS entries of w2k8r2c Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
-rw-r--r--source4/setup/dns_update_list41
1 files changed, 28 insertions, 13 deletions
diff --git a/source4/setup/dns_update_list b/source4/setup/dns_update_list
index d866495e7a..4da0398196 100644
--- a/source4/setup/dns_update_list
+++ b/source4/setup/dns_update_list
@@ -4,21 +4,36 @@ A ${DNSDOMAIN} $IP
A ${HOSTNAME} $IP
AAAA ${DNSDOMAIN} $IP
AAAA ${HOSTNAME} $IP
+
+A gc._msdcs.${DNSFOREST} $IP
+AAAA gc._msdcs.${DNSFOREST} $IP
+
CNAME ${NTDSGUID}._msdcs.${DNSFOREST} ${HOSTNAME}
-SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88
-SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 389
+
+SRV _kpasswd._tcp.${DNSDOMAIN} ${HOSTNAME} 464
+SRV _kpasswd._udp.${DNSDOMAIN} ${HOSTNAME} 464
+
+SRV _kerberos._tcp.${DNSDOMAIN} ${HOSTNAME} 88
SRV _kerberos._tcp.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88
+SRV _kerberos._tcp.dc._msdcs.${DNSFOREST} ${HOSTNAME} 88
+SRV _kerberos._tcp.${SITE}._sites.${DNSDOMAIN} ${HOSTNAME} 88
+SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88
+SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSFOREST} ${HOSTNAME} 88
+
+SRV _kerberos._udp.${DNSDOMAIN} ${HOSTNAME} 88
+
+SRV _ldap._tcp.${DNSDOMAIN} ${HOSTNAME} 389
SRV _ldap._tcp.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 389
-SRV _ldap._tcp.${DOMAINGUID}.domains._msdcs.${DNSDOMAIN} ${HOSTNAME} 389
-SRV _ldap._tcp.${SITE}._sites.gc._msdcs.${DNSDOMAIN} ${HOSTNAME} 3268
-SRV _ldap._tcp.gc._msdcs.${DNSDOMAIN} ${HOSTNAME} 3268
+SRV _ldap._tcp.dc._msdcs.${DNSFOREST} ${HOSTNAME} 389
+SRV _ldap._tcp.gc._msdcs.${DNSFOREST} ${HOSTNAME} 3268
SRV _ldap._tcp.pdc._msdcs.${DNSDOMAIN} ${HOSTNAME} 389
-SRV _gc._tcp.${SITE}._sites.${DNSDOMAIN} ${HOSTNAME} 3268
-SRV _kerberos._tcp.${SITE}._sites.${DNSDOMAIN} ${HOSTNAME} 88
+SRV _ldap._tcp.pdc._msdcs.${DNSFOREST} ${HOSTNAME} 389
SRV _ldap._tcp.${SITE}._sites.${DNSDOMAIN} ${HOSTNAME} 389
-SRV _gc._tcp.${DNSDOMAIN} ${HOSTNAME} 3268
-SRV _kerberos._tcp.${DNSDOMAIN} ${HOSTNAME} 88
-SRV _kpasswd._tcp.${DNSDOMAIN} ${HOSTNAME} 464
-SRV _ldap._tcp.${DNSDOMAIN} ${HOSTNAME} 389
-SRV _kerberos._udp.${DNSDOMAIN} ${HOSTNAME} 88
-SRV _kpasswd._udp.${DNSDOMAIN} ${HOSTNAME} 464
+SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 389
+SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSFOREST} ${HOSTNAME} 389
+SRV _ldap._tcp.${SITE}._sites.gc._msdcs.${DNSFOREST} ${HOSTNAME} 3268
+SRV _ldap._tcp.${DOMAINGUID}.domains._msdcs.${DNSFOREST} ${HOSTNAME} 389
+
+
+SRV _gc._tcp.${DNSFOREST} ${HOSTNAME} 3268
+SRV _gc._tcp.${SITE}._sites.${DNSFOREST} ${HOSTNAME} 3268