diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-04-05 16:51:24 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2012-04-16 03:52:14 +0200 |
| commit | 06a010108251ac58010e65ffea97b307551d6122 (patch) | |
| tree | b30a5ebc8120077109b71b5b8a684a1643d75aa8 | |
| parent | bbc98df743fb81b560bbb0d1e2a3db6425720fac (diff) | |
| download | samba-06a010108251ac58010e65ffea97b307551d6122.tar.gz samba-06a010108251ac58010e65ffea97b307551d6122.tar.bz2 samba-06a010108251ac58010e65ffea97b307551d6122.zip | |
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
| -rw-r--r-- | source4/scripting/python/samba/provision/sambadns.py | 4 | ||||
| -rw-r--r-- | source4/setup/named.conf.dlz | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py index f24284abf6..5c3e6ba879 100644 --- 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 c90020ff59..be20a57a63 100644 --- 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"; }; |