diff options
| -rw-r--r-- | python/samba/provision/sambadns.py | 7 | ||||
| -rw-r--r-- | source4/setup/named.conf.dlz | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 6071a9ac18c..2ef9320ba7d 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -962,6 +962,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_10 = '#' bind9_11 = '#' bind9_12 = '#' + bind9_14 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: @@ -972,6 +973,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_11 = '' elif bind_info.upper().find('BIND 9.12') != -1: bind9_12 = '' + elif bind_info.upper().find('BIND 9.14') != -1: + bind9_14 = '' 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: @@ -985,8 +988,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "BIND9_9": bind9_9, "BIND9_10": bind9_10, "BIND9_11": bind9_11, - "BIND9_12": bind9_12 - + "BIND9_12": bind9_12, + "BIND9_14": bind9_14 }) diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz index 9341d7ea615..420e7b7c88d 100644 --- a/source4/setup/named.conf.dlz +++ b/source4/setup/named.conf.dlz @@ -24,5 +24,8 @@ dlz "AD DNS Zone" { # For BIND 9.12.x ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; + + # For BIND 9.14.x + ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; }; |