diff options
author | Andrew Tridgell <tridge@samba.org> | 2011-08-22 17:28:29 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2011-08-25 07:39:38 +1000 |
commit | 42ae193e3f8ace2e81b4b754e557ba37dcf2b80e (patch) | |
tree | dabefd98f8480b311bff77e99d6886af9d71dfaf | |
parent | 53b08bfbdb68724aa7cfb26c9d53f6adf8373423 (diff) | |
download | samba-42ae193e3f8ace2e81b4b754e557ba37dcf2b80e.tar.gz samba-42ae193e3f8ace2e81b4b754e557ba37dcf2b80e.tar.bz2 samba-42ae193e3f8ace2e81b4b754e557ba37dcf2b80e.zip |
s4-dns: fixed DNS and SPN update lists for multi-domain support
fixed DNS to point at forest root
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
-rw-r--r-- | source4/setup/dns_update_list | 2 | ||||
-rw-r--r-- | source4/setup/spn_update_list | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/setup/dns_update_list b/source4/setup/dns_update_list index 91b182188b..d866495e7a 100644 --- a/source4/setup/dns_update_list +++ b/source4/setup/dns_update_list @@ -4,7 +4,7 @@ A ${DNSDOMAIN} $IP A ${HOSTNAME} $IP AAAA ${DNSDOMAIN} $IP AAAA ${HOSTNAME} $IP -CNAME ${NTDSGUID}._msdcs.${DNSDOMAIN} ${HOSTNAME} +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 _kerberos._tcp.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88 diff --git a/source4/setup/spn_update_list b/source4/setup/spn_update_list index da892c26ed..8e6fb6c01f 100644 --- a/source4/setup/spn_update_list +++ b/source4/setup/spn_update_list @@ -5,13 +5,13 @@ HOST/${HOSTNAME} HOST/${HOSTNAME}/${WORKGROUP} ldap/${HOSTNAME}/${WORKGROUP} -GC/${HOSTNAME}/${DNSDOMAIN} +GC/${HOSTNAME}/${DNSFOREST} ldap/${HOSTNAME} HOST/${HOSTNAME}/${DNSDOMAIN} ldap/${HOSTNAME}/${DNSDOMAIN} HOST/${NETBIOSNAME} E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN} -ldap/${NTDSGUID}._msdcs.${DNSDOMAIN} +ldap/${NTDSGUID}._msdcs.${DNSFOREST} ldap/${NETBIOSNAME} RestrictedKrbHost/${NETBIOSNAME} RestrictedKrbHost/${HOSTNAME} |