From 94ffd4b7ad6680d0352d5cbdcda7dd61fd981809 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 8 Aug 2018 19:43:03 +1000 Subject: [PATCH] dlz-bind: Add support for BIND 9.12.x Signed-off-by: Amitay Isaacs Reviewed-by: Andrew Bartlett --- 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 89ada7a6fdb..193904f4b2c 100644 --- a/source4/dns_server/dlz_minimal.h +++ b/source4/dns_server/dlz_minimal.h @@ -34,6 +34,9 @@ #elif defined (BIND_VERSION_9_11) # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 2 +#elif defined (BIND_VERSION_9_12) +# 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 c01e618b561..0fd6aa80339 100644 --- a/source4/dns_server/wscript_build +++ b/source4/dns_server/wscript_build @@ -58,6 +58,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_11', deps='samba-hostconfig samdb-common gensec popt dnsserver_common', enabled=bld.AD_DC_BUILD_IS_ENABLED()) +bld.SAMBA_LIBRARY('dlz_bind9_12', + source='dlz_bind9.c', + cflags='-DBIND_VERSION_9_12', + private_library=True, + link_name='modules/bind9/dlz_bind9_12.so', + realname='dlz_bind9_12.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',