From 8a7fc998f0930145d74aa5e32ae67ae4bd996af0 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 11 Sep 2020 12:35:30 +1000 Subject: [PATCH] provision: Add support for BIND 9.16.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs Reviewed-by: Rowland Penny (cherry picked from commit 5b2ccb1c7cad5cded5dad37a18a7d42c1680b2f7) --- 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 2827309694b..70381b8fec3 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -963,6 +963,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_11 = '#' bind9_12 = '#' bind9_14 = '#' + bind9_16 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: @@ -975,6 +976,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_12 = '' elif bind_info.upper().find('BIND 9.14') != -1: bind9_14 = '' + elif bind_info.upper().find('BIND 9.16') != -1: + bind9_16 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") elif bind_info.upper().find('BIND_9.13') != -1: @@ -991,7 +994,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "BIND9_10": bind9_10, "BIND9_11": bind9_11, "BIND9_12": bind9_12, - "BIND9_14": bind9_14 + "BIND9_14": bind9_14, + "BIND9_16": bind9_16 }) diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz index 420e7b7c88d..c2c41e2cddf 100644 --- a/source4/setup/named.conf.dlz +++ b/source4/setup/named.conf.dlz @@ -27,5 +27,8 @@ dlz "AD DNS Zone" { # For BIND 9.14.x ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; + + # For BIND 9.16.x + ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so"; }; -- 2.47.2