s4:setup/dns_update_list: make use of the new substitution variables

This let us register the same names as Windows Servers.

We only exception are the NS records. In future we could add them
by using something like this:

  samba-tool dns add ${HOSTNAME} ${DNSDOMAIN} @ NS ${HOSTNAME}
  samba-tool dns add ${HOSTNAME} _msdcs.${DNSFOREST} @ NS ${HOSTNAME}
  samba-tool dns add ${HOSTNAME} ${DNSFOREST} _msdcs NS ${HOSTNAME}

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9831

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Aug 26 11:38:54 CEST 2014 on sn-devel-104

diff --git a/source4/setup/dns_update_list b/source4/setup/dns_update_list
index 4da0398196eea04d4de983b0a4ba7dc20d586570..deac459d7aa79ed24f6ef66e172ed100ae2a1b97 100644 (file)
--- a/source4/setup/dns_update_list
+++ b/source4/setup/dns_update_list
@@ -1,39 +1,49 @@
 # this is a list of DNS entries which will be put into DNS using
 # dynamic DNS update. It is processed by the samba_dnsupdate script
-A                                                        ${DNSDOMAIN} $IP
-A                                                        ${HOSTNAME} $IP
-AAAA                                                     ${DNSDOMAIN} $IP
-AAAA                                                     ${HOSTNAME} $IP
+A                      ${HOSTNAME}                                           $IP
+AAAA                   ${HOSTNAME}                                           $IP
+
+# RW domain controller
+${IF_RWDC}A            ${DNSDOMAIN}                                          $IP
+${IF_RWDC}AAAA         ${DNSDOMAIN}                                          $IP
+${IF_RWDC}SRV          _ldap._tcp.${DNSDOMAIN}                               ${HOSTNAME} 389
+${IF_RWDC}SRV          _ldap._tcp.dc._msdcs.${DNSDOMAIN}                     ${HOSTNAME} 389
+${IF_RWDC}SRV          _ldap._tcp.${DOMAINGUID}.domains._msdcs.${DNSFOREST}  ${HOSTNAME} 389
+${IF_RWDC}SRV          _kerberos._tcp.${DNSDOMAIN}                           ${HOSTNAME} 88
+${IF_RWDC}SRV          _kerberos._udp.${DNSDOMAIN}                           ${HOSTNAME} 88
+${IF_RWDC}SRV          _kerberos._tcp.dc._msdcs.${DNSDOMAIN}                 ${HOSTNAME} 88
+${IF_RWDC}SRV          _kpasswd._tcp.${DNSDOMAIN}                            ${HOSTNAME} 464
+${IF_RWDC}SRV          _kpasswd._udp.${DNSDOMAIN}                            ${HOSTNAME} 464
+# RW and RO domain controller
+${IF_DC}CNAME          ${NTDSGUID}._msdcs.${DNSFOREST}                       ${HOSTNAME}
+${IF_DC}SRV            _ldap._tcp.${SITE}._sites.${DNSDOMAIN}                ${HOSTNAME} 389
+${IF_DC}SRV            _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}      ${HOSTNAME} 389
+${IF_DC}SRV            _kerberos._tcp.${SITE}._sites.${DNSDOMAIN}            ${HOSTNAME} 88
+${IF_DC}SRV            _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}  ${HOSTNAME} 88
+
+# The PDC emulator
+${IF_PDC}SRV           _ldap._tcp.pdc._msdcs.${DNSDOMAIN}                    ${HOSTNAME} 389
+
+# RW GC servers
+${IF_RWGC}A            gc._msdcs.${DNSFOREST}                                $IP
+${IF_RWGC}AAAA         gc._msdcs.${DNSFOREST}                                $IP
+${IF_RWGC}SRV          _gc._tcp.${DNSFOREST}                                 ${HOSTNAME} 3268
+${IF_RWGC}SRV          _ldap._tcp.gc._msdcs.${DNSFOREST}                     ${HOSTNAME} 3268
+# RW and RO GC servers
+${IF_GC}SRV            _gc._tcp.${SITE}._sites.${DNSFOREST}                  ${HOSTNAME} 3268
+${IF_GC}SRV            _ldap._tcp.${SITE}._sites.gc._msdcs.${DNSFOREST}      ${HOSTNAME} 3268
+
+# RW DNS servers
+${IF_RWDNS_DOMAIN}A    DomainDnsZones.${DNSDOMAIN}                           $IP
+${IF_RWDNS_DOMAIN}AAAA DomainDnsZones.${DNSDOMAIN}                           $IP
+${IF_RWDNS_DOMAIN}SRV  _ldap._tcp.DomainDnsZones.${DNSDOMAIN}                ${HOSTNAME} 389
+# RW and RO DNS servers
+${IF_DNS_DOMAIN}SRV    _ldap._tcp.${SITE}._sites.DomainDnsZones.${DNSDOMAIN} ${HOSTNAME} 389
+
+# RW DNS servers
+${IF_RWDNS_FOREST}A    ForestDnsZones.${DNSFOREST}                           $IP
+${IF_RWDNS_FOREST}AAAA ForestDnsZones.${DNSFOREST}                           $IP
+${IF_RWDNS_FOREST}SRV  _ldap._tcp.ForestDnsZones.${DNSFOREST}                ${HOSTNAME} 389
+# RW and RO DNS servers
+${IF_DNS_FOREST}SRV    _ldap._tcp.${SITE}._sites.ForestDnsZones.${DNSFOREST} ${HOSTNAME} 389
 
-A                                                        gc._msdcs.${DNSFOREST} $IP
-AAAA                                                     gc._msdcs.${DNSFOREST} $IP
-
-CNAME ${NTDSGUID}._msdcs.${DNSFOREST}                    ${HOSTNAME}
-
-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.dc._msdcs.${DNSFOREST}                    ${HOSTNAME} 389
-SRV _ldap._tcp.gc._msdcs.${DNSFOREST}                    ${HOSTNAME} 3268
-SRV _ldap._tcp.pdc._msdcs.${DNSDOMAIN}                   ${HOSTNAME} 389
-SRV _ldap._tcp.pdc._msdcs.${DNSFOREST}                   ${HOSTNAME} 389
-SRV _ldap._tcp.${SITE}._sites.${DNSDOMAIN}              ${HOSTNAME} 389
-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