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.14.x

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Rowland Penny <rpenny@samba.org>
This commit is contained in:
Amitay Isaacs 2020-09-11 12:26:21 +10:00 committed by Amitay Isaacs
parent a167a2154d
commit 016c1174ef
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,6 +962,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
bind9_10 = '#'
bind9_11 = '#'
bind9_12 = '#'
bind9_14 = '#'
if bind_info.upper().find('BIND 9.8') != -1:
bind9_8 = ''
elif bind_info.upper().find('BIND 9.9') != -1:
@ -972,6 +973,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
bind9_11 = ''
elif bind_info.upper().find('BIND 9.12') != -1:
bind9_12 = ''
elif bind_info.upper().find('BIND 9.14') != -1:
bind9_14 = ''
elif bind_info.upper().find('BIND 9.7') != -1:
raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
elif bind_info.upper().find('BIND_9.13') != -1:
@ -985,8 +988,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
"BIND9_9": bind9_9,
"BIND9_10": bind9_10,
"BIND9_11": bind9_11,
"BIND9_12": bind9_12
"BIND9_12": bind9_12,
"BIND9_14": bind9_14
})

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

@ -24,5 +24,8 @@ dlz "AD DNS Zone" {
# For BIND 9.12.x
${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
# For BIND 9.14.x
${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
};