From 5400b928d426af5dc56234ce110a3871d88c015d Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 11 Sep 2020 12:24:51 +1000 Subject: [PATCH] bind9-dlz: Add support for BIND 9.14.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs Reviewed-by: Rowland Penny (cherry picked from commit a167a2154d4909e8e1f97d9f36d0e4c947f2d944) --- source4/dns_server/dlz_minimal.h | 3 +++ source4/dns_server/wscript_build | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h index 9a7090f48fd..a82bb381ee1 100644 --- a/source4/dns_server/dlz_minimal.h +++ b/source4/dns_server/dlz_minimal.h @@ -44,6 +44,9 @@ # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 2 # define ISC_BOOLEAN_AS_BOOL 0 +#elif defined (BIND_VERSION_9_14) +# define DLZ_DLOPEN_VERSION 3 +# define DNS_CLIENTINFO_VERSION 2 #else # error Unsupported BIND version #endif diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build index 8a8466d096f..b24aeb73d59 100644 --- a/source4/dns_server/wscript_build +++ b/source4/dns_server/wscript_build @@ -68,6 +68,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_12', deps='samba-hostconfig samdb-common gensec popt dnsserver_common', enabled=bld.AD_DC_BUILD_IS_ENABLED()) +bld.SAMBA_LIBRARY('dlz_bind9_14', + source='dlz_bind9.c', + cflags='-DBIND_VERSION_9_14', + private_library=True, + link_name='modules/bind9/dlz_bind9_14.so', + realname='dlz_bind9_14.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_8', -- 2.47.2