[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  336ebea... s4-provision: added dns_update_list
       via  5bf9db7... s4-provision: setup the dns_update_list at provision time
       via  44f9d5a... s4-provision: if we aren't doing variable substitution then don't check for vars
      from  721bcfa... dns: auto-delete incorrect SRV entries for our hostname

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 336ebeabad687dd81c87e0ac01e68853e15f27b1
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Feb 26 14:27:28 2010 +1100

    s4-provision: added dns_update_list
    
    This contains the list of DNS names we should have as a DC

commit 5bf9db7e315c392be7aa610e922c63bf2510bce6
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Feb 26 14:25:07 2010 +1100

    s4-provision: setup the dns_update_list at provision time
    
    This file is substituted at runtime by samba_dnsupdate

commit 44f9d5aadcd3d86e754b5e899c9ecbaa82dd41e8
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Feb 26 14:24:38 2010 +1100

    s4-provision: if we aren't doing variable substitution then don't check for vars

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/__init__.py  |    2 +-
 source4/scripting/python/samba/provision.py |    5 +++++
 source4/setup/dns_update_list               |   20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletions(-)
 create mode 100644 source4/setup/dns_update_list


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 3544c49..5c36673 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -353,7 +353,7 @@ def read_and_sub_file(file, subst_vars):
     data = open(file, 'r').read()
     if subst_vars is not None:
         data = substitute_var(data, subst_vars)
-    check_all_substituted(data)
+        check_all_substituted(data)
     return data
 
 
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 900df89..6adc79f 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -296,6 +296,7 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.secrets = os.path.join(paths.private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.privilege = os.path.join(paths.private_dir, "privilege.ldb")
     paths.dns = os.path.join(paths.private_dir, "dns", dnsdomain + ".zone")
+    paths.dns_update_list = os.path.join(paths.private_dir, "dns_update_list")
     paths.namedconf = os.path.join(paths.private_dir, "named.conf")
     paths.namedconf_update = os.path.join(paths.private_dir, "named.conf.update")
     paths.namedtxt = os.path.join(paths.private_dir, "named.txt")
@@ -1554,6 +1555,10 @@ def create_zone_file(lp, message, paths, targetdir, setup_path, dnsdomain,
             "HOSTIP6_HOST_LINE": hostip6_host_line,
         })
 
+    # note that we use no variable substitution on this file
+    # the substitution is done at runtime by samba_dnsupdate
+    setup_file(setup_path("dns_update_list"), paths.dns_update_list, None)
+
     if paths.bind_gid is not None:
         try:
             os.chown(dns_dir, -1, paths.bind_gid)
diff --git a/source4/setup/dns_update_list b/source4/setup/dns_update_list
new file mode 100644
index 0000000..b9ee2a6
--- /dev/null
+++ b/source4/setup/dns_update_list
@@ -0,0 +1,20 @@
+A                                                        ${DNSDOMAIN} $IP
+A                                                        ${HOSTNAME} $IP
+CNAME ${NTDSGUID}._msdcs.${DNSDOMAIN}                    ${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.dc._msdcs.${DNSDOMAIN}             ${HOSTNAME} 88
+SRV _ldap._tcp.dc.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.pdc._msdcs.${DNSDOMAIN}                   ${HOSTNAME} 389
+SRV _gc._tcp.${SITE}._sites.${DNSDOMAIN}                 ${HOSTNAME} 3268
+SRV _kerberos._tcp.${SITE}._sites.${DNSDOMAIN}           ${HOSTNAME} 88
+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


-- 
Samba Shared Repository