From 295361c13d12782b2248e53b30e4101a41a96f90 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 8 Sep 2011 15:29:59 +1000 Subject: s4-provision: Remove dupliate creation of dns/spn_update_list files dns_update_list and spn_update_list are set up using create_dns_update_list() function. Signed-off-by: Andrew Bartlett --- source4/scripting/python/samba/provision/__init__.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 9c2815721f..2d9d867593 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -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) -- cgit