From 1a86733d034019083cadb137cb81dba661f96b66 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 8 Aug 2018 19:44:38 +1000 Subject: [PATCH] provision: Add support for BIND 9.12.x Signed-off-by: Amitay Isaacs Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Aug 10 05:36:19 CEST 2018 on sn-devel-144 --- python/samba/provision/sambadns.py | 6 +++++- source4/setup/named.conf.dlz | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index e2b6fcd0c28..a04d8b83ddb 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -953,6 +953,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_9 = '#' bind9_10 = '#' bind9_11 = '#' + bind9_12 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: @@ -961,6 +962,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_10 = '' elif bind_info.upper().find('BIND 9.11') != -1: bind9_11 = '' + elif bind_info.upper().find('BIND 9.12') != -1: + bind9_12 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: @@ -971,7 +974,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "BIND9_8" : bind9_8, "BIND9_9" : bind9_9, "BIND9_10" : bind9_10, - "BIND9_11" : bind9_11 + "BIND9_11" : bind9_11, + "BIND9_12" : bind9_12 }) diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz index 215af5a17f0..9341d7ea615 100644 --- a/source4/setup/named.conf.dlz +++ b/source4/setup/named.conf.dlz @@ -21,5 +21,8 @@ dlz "AD DNS Zone" { # For BIND 9.11.x ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so"; + + # For BIND 9.12.x + ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; }; -- 2.34.1