From: Amitay Isaacs Date: Fri, 11 Sep 2020 02:34:07 +0000 (+1000) Subject: bind9-dlz: Add support for BIND 9.16.x X-Git-Tag: samba-4.12.10~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7336a1c67550281627b108a402b36c675c5247ce;p=thirdparty%2Fsamba.git bind9-dlz: Add support for BIND 9.16.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs Reviewed-by: Rowland Penny (cherry picked from commit ca3c18a236dedfdfbf225dcfcd0418f1634d8759) --- diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h index a82bb381ee1..d991528d6ad 100644 --- a/source4/dns_server/dlz_minimal.h +++ b/source4/dns_server/dlz_minimal.h @@ -47,6 +47,9 @@ #elif defined (BIND_VERSION_9_14) # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 2 +#elif defined (BIND_VERSION_9_16) +# 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 b24aeb73d59..e97c85de44a 100644 --- a/source4/dns_server/wscript_build +++ b/source4/dns_server/wscript_build @@ -78,6 +78,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_14', deps='samba-hostconfig samdb-common gensec popt dnsserver_common', enabled=bld.AD_DC_BUILD_IS_ENABLED()) +bld.SAMBA_LIBRARY('dlz_bind9_16', + source='dlz_bind9.c', + cflags='-DBIND_VERSION_9_16', + private_library=True, + link_name='modules/bind9/dlz_bind9_16.so', + realname='dlz_bind9_16.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',