diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-10-20 16:32:42 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-25 05:42:19 +0200 |
| commit | faa3423d1a26eb6103389b234add0f1e8d0dfc08 (patch) | |
| tree | 7bb860dbd3de604841600f06a6d575045991af3f /python/samba/provision/sambadns.py | |
| parent | aeb6ad8a9c2713c6c71a2ac4cd355dd1bda6cc51 (diff) | |
| download | samba-faa3423d1a26eb6103389b234add0f1e8d0dfc08.tar.gz samba-faa3423d1a26eb6103389b234add0f1e8d0dfc08.tar.xz samba-faa3423d1a26eb6103389b234add0f1e8d0dfc08.zip | |
s4-dns: Add support for BIND 9.10
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Matthieu Patou <mat@matws.net>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Sat Oct 25 05:42:19 CEST 2014 on sn-devel-104
Diffstat (limited to 'python/samba/provision/sambadns.py')
| -rw-r--r-- | python/samba/provision/sambadns.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 1ab8f4e303..b5639324b4 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -921,10 +921,13 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): cwd='.').communicate()[0] bind9_8 = '#' bind9_9 = '#' + bind9_10 = '#' 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.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") else: @@ -933,7 +936,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "NAMED_CONF": paths.namedconf, "MODULESDIR" : samba.param.modules_dir(), "BIND9_8" : bind9_8, - "BIND9_9" : bind9_9 + "BIND9_9" : bind9_9, + "BIND9_10" : bind9_10 }) |