diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-10-20 16:40:05 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-25 03:21:04 +0200 |
| commit | 58334eb58ed2f11c6f212481b6be772d9f182810 (patch) | |
| tree | cd4dfe4376b5e9d4355e14fcf32e39b2bea5c3e4 /python | |
| parent | bb44710200423790fb7f6f8873a4b711e5f67888 (diff) | |
| download | samba-58334eb58ed2f11c6f212481b6be772d9f182810.tar.gz samba-58334eb58ed2f11c6f212481b6be772d9f182810.tar.xz samba-58334eb58ed2f11c6f212481b6be772d9f182810.zip | |
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 <amitay@gmail.com>
Reviewed-by: Matthieu Patou <mat@matws.net>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/provision/sambadns.py | 12 |
1 files changed, 6 insertions, 6 deletions
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 }) |