From: Amitay Isaacs <amitay@gmail.com>
Date: Mon, 26 Sep 2016 14:51:03 +0000 (+1000)
Subject: provision: Add support for BIND 9.11.x
X-Git-Tag: samba-4.4.9~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db76a09c69cd9dfdc362ea98b3479e6763b9ff19;p=thirdparty%2Fsamba.git

provision: Add support for BIND 9.11.x

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12366

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Oct 28 03:42:25 CEST 2016 on sn-devel-144

(cherry picked from commit 2959c8888d46902e140963ed4190d23a7609b8da)

Autobuild-User(v4-4-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-4-test): Thu Nov  3 12:29:19 CET 2016 on sn-devel-144
---

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index a3931813a65..ab596ce2dc0 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";
 };