From 58334eb58ed2f11c6f212481b6be772d9f182810 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 20 Oct 2014 16:40:05 +1100 Subject: s4-dns: Update template variables, change BIND98 --> BIND9_8 This makes it easier to add suport for BIND 9.10. Signed-off-by: Amitay Isaacs Reviewed-by: Matthieu Patou --- python/samba/provision/sambadns.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'python') diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 29224c8cf6..1ab8f4e303 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -919,12 +919,12 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd='.').communicate()[0] - bind98 = '#' - bind99 = '#' + bind9_8 = '#' + bind9_9 = '#' if bind_info.upper().find('BIND 9.8') != -1: - bind98 = '' + bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: - bind99 = '' + bind9_9 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: @@ -932,8 +932,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): setup_file(setup_path("named.conf.dlz"), paths.namedconf, { "NAMED_CONF": paths.namedconf, "MODULESDIR" : samba.param.modules_dir(), - "BIND98" : bind98, - "BIND99" : bind99 + "BIND9_8" : bind9_8, + "BIND9_9" : bind9_9 }) -- cgit