s4-provision: Update configuration lines for dlz_bind9

This adds configuration lines for BIND versions 9.8.x and 9.9.x.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Mon Apr 16 03:52:14 CEST 2012 on sn-devel-104

diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py
index f24284abf6a70f03f0623dadaa22af5cabda2081..5c3e6ba879bdf784124e62428c409a6e79423dce 100644 (file)
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -814,11 +814,9 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend):
         setup_file(setup_path("named.conf.update"), paths.namedconf_update)
 
     elif dns_backend == "BIND9_DLZ":
-        dlz_module_path = os.path.join(samba.param.modules_dir(),
-                                        "bind9/dlz_bind9.so")
         setup_file(setup_path("named.conf.dlz"), paths.namedconf, {
                     "NAMED_CONF": paths.namedconf,
-                    "BIND9_DLZ_MODULE": dlz_module_path,
+                    "MODULESDIR" : samba.param.modules_dir(),
                     })
 
 

diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz
index c90020ff59cbe66642d21d354d259fa631ebfebe..be20a57a6387c46ed84cf522dacb98a6527f524b 100644 (file)
--- a/source4/setup/named.conf.dlz
+++ b/source4/setup/named.conf.dlz
@@ -7,8 +7,13 @@
 
 #
 # This configures dynamically loadable zones (DLZ) from AD schema
+# Uncomment only single database line, depending on your BIND version
 #
 dlz "AD DNS Zone" {
-    database "dlopen ${BIND9_DLZ_MODULE}";
+    # For BIND 9.8.0
+    database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
+
+    # For BIND 9.9.0
+    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
 };