s4-provision: Remove dupliate creation of dns/spn_update_list files
authorAmitay Isaacs <amitay@gmail.com>
Thu, 8 Sep 2011 05:29:59 +0000 (15:29 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 12 Sep 2011 10:42:15 +0000 (20:42 +1000)
dns_update_list and spn_update_list are set up using
create_dns_update_list() function.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
source4/scripting/python/samba/provision/__init__.py

index 9c2815721fc6975201140a4ffe18ae60fd77aa80..2d9d86759367e852657ed44253ee59d2a63a44a7 100644 (file)
@@ -2005,13 +2005,6 @@ def create_zone_file(lp, logger, paths, targetdir, dnsdomain,
             "GC_MSDCS_IP6_LINE": gc_msdcs_ip6_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)
-
-    # and the SPN update list
-    setup_file(setup_path("spn_update_list"), paths.spn_update_list, None)
-
     if paths.bind_gid is not None:
         try:
             os.chown(dns_dir, -1, paths.bind_gid)
@@ -2031,7 +2024,7 @@ def create_zone_file(lp, logger, paths, targetdir, dnsdomain,
 def create_dns_update_list(lp, logger, paths):
     """Write out a dns_update_list file"""
     # note that we use no variable substitution on this file
-    # the substitution is done at runtime by samba_dnsupdate
+    # the substitution is done at runtime by samba_dnsupdate, samba_spnupdate
     setup_file(setup_path("dns_update_list"), paths.dns_update_list, None)
     setup_file(setup_path("spn_update_list"), paths.spn_update_list, None)