sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

s4/dlz: add support for bind 9.18

Browse Source 
It seems nothing has changed since 9.16 for our purposes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14986

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Signed-off-by: Andreas Hasenack <andreas@canonical.com>
Pair-programmed-with: Andreas Hasenack <andreas@canonical.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Mon May 23 00:53:09 UTC 2022 on sn-devel-184
This commit is contained in:
Douglas Bagnall 2022-02-24 12:17:00 +13:00 committed by Douglas Bagnall
parent be944dce00
commit 03036442de
4 changed files with 21 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

@ -1015,6 +1015,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
bind9_12 = '#'
bind9_14 = '#'
bind9_16 = '#'
bind9_18 = '#'
if bind_info.upper().find('BIND 9.8') != -1:
bind9_8 = ''
elif bind_info.upper().find('BIND 9.9') != -1:
@ -1029,6 +1030,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
bind9_14 = ''
elif bind_info.upper().find('BIND 9.16') != -1:
bind9_16 = ''
elif bind_info.upper().find('BIND 9.18') != -1:
bind9_18 = ''
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:
@ -1048,7 +1051,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
"BIND9_11": bind9_11,
"BIND9_12": bind9_12,
"BIND9_14": bind9_14,
"BIND9_16": bind9_16
"BIND9_16": bind9_16,
"BIND9_18": bind9_18
})

3
source4/dns_server/dlz_minimal.h
View File

@ -48,6 +48,9 @@
#elif defined (BIND_VERSION_9_16)
# define DLZ_DLOPEN_VERSION 3
# define DNS_CLIENTINFO_VERSION 2
#elif defined (BIND_VERSION_9_18)
# define DLZ_DLOPEN_VERSION 3
# define DNS_CLIENTINFO_VERSION 2
#else
# error Unsupported BIND version
#endif

10
source4/dns_server/wscript_build
View File

@ -70,6 +70,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_16',
deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
enabled=bld.AD_DC_BUILD_IS_ENABLED())
bld.SAMBA_LIBRARY('dlz_bind9_18',
source='dlz_bind9.c',
cflags='-DBIND_VERSION_9_18',
private_library=True,
link_name='modules/bind9/dlz_bind9_18.so',
realname='dlz_bind9_18.so',
install_path='${MODULESDIR}/bind9',
deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
enabled=bld.AD_DC_BUILD_IS_ENABLED())
bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
source='dlz_bind9.c',
cflags='-DBIND_VERSION_9_16',

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

@ -30,5 +30,8 @@ dlz "AD DNS Zone" {
# For BIND 9.16.x
${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so";
#
# For BIND 9.18.x
${BIND9_18} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_18.so";
};