diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 6823f9ee56b..404b346a885 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -1017,6 +1017,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_12 = '#' bind9_14 = '#' bind9_16 = '#' + bind9_18 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: @@ -1031,6 +1032,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_14 = '' elif bind_info.upper().find('BIND 9.16') != -1: bind9_16 = '' + elif bind_info.upper().find('BIND 9.18') != -1: + bind9_18 = '' 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: @@ -1050,7 +1053,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "BIND9_11": bind9_11, "BIND9_12": bind9_12, "BIND9_14": bind9_14, - "BIND9_16": bind9_16 + "BIND9_16": bind9_16, + "BIND9_18": bind9_18 }) diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz index c2c41e2cddf..cbe7d805f58 100644 --- a/source4/setup/named.conf.dlz +++ b/source4/setup/named.conf.dlz @@ -30,5 +30,8 @@ dlz "AD DNS Zone" { # For BIND 9.16.x ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so"; + # + # For BIND 9.18.x + ${BIND9_18} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_18.so"; };