provision: Add support for BIND 9.12.x

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Aug 10 05:36:19 CEST 2018 on sn-devel-144

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index e2b6fcd0c2831157463a1ca567888010b6c06d17..a04d8b83ddbe0d8e2da6aace962f1a06fbb3959b 100644 (file)
--- 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 215af5a17f0c7c3d532d91a69934b564ffc75c63..9341d7ea6151bd92f496c594a0349ffe8959a954 100644 (file)
--- 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";
 };