diff options
| -rw-r--r-- | python/samba/provision/sambadns.py | 6 | ||||
| -rw-r--r-- | source4/setup/named.conf.dlz | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 67d34e552cd..df4673b9619 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -923,12 +923,15 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_8 = '#' bind9_9 = '#' bind9_10 = '#' + bind9_11 = '#' 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.11') != -1: + bind9_11 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: @@ -938,7 +941,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "MODULESDIR" : samba.param.modules_dir(), "BIND9_8" : bind9_8, "BIND9_9" : bind9_9, - "BIND9_10" : bind9_10 + "BIND9_10" : bind9_10, + "BIND9_11" : bind9_11 }) diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz index 460d2ca6420..215af5a17f0 100644 --- a/source4/setup/named.conf.dlz +++ b/source4/setup/named.conf.dlz @@ -18,5 +18,8 @@ dlz "AD DNS Zone" { # For BIND 9.10.x ${BIND9_10} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so"; + + # For BIND 9.11.x + ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so"; }; |