From faa3423d1a26eb6103389b234add0f1e8d0dfc08 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 20 Oct 2014 16:32:42 +1100 Subject: s4-dns: Add support for BIND 9.10 Signed-off-by: Amitay Isaacs Reviewed-by: Matthieu Patou Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Sat Oct 25 05:42:19 CEST 2014 on sn-devel-104 --- python/samba/provision/sambadns.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'python') diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 1ab8f4e303..b5639324b4 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -921,10 +921,13 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): cwd='.').communicate()[0] bind9_8 = '#' bind9_9 = '#' + bind9_10 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: bind9_9 = '' + elif bind_info.upper().find('BIND 9.10') != -1: + bind9_10 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: @@ -933,7 +936,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "NAMED_CONF": paths.namedconf, "MODULESDIR" : samba.param.modules_dir(), "BIND9_8" : bind9_8, - "BIND9_9" : bind9_9 + "BIND9_9" : bind9_9, + "BIND9_10" : bind9_10 }) -- cgit