sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

provision: Add support for BIND 9.12.x

Browse Source 
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
This commit is contained in:
Amitay Isaacs 2018-08-08 19:44:38 +10:00 committed by Andrew Bartlett
parent 94ffd4b7ad
commit 1a86733d03
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/samba/provision/sambadns.py
View File

@ -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
})

3
source4/setup/named.conf.dlz
View File

@ -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";
};