bind9-dlz: Add support for BIND 9.16.x

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>
(cherry picked from commit ca3c18a236dedfdfbf225dcfcd0418f1634d8759)

diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index a82bb381ee101e4774ba2e3393dfa9abb2638886..d991528d6adcaae8dd3e0e4dc1fbad98a09940ea 100644 (file)
--- 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 b24aeb73d59d6ee669bb14040d8bbcbb25b10c04..e97c85de44a81f6ff69e80210178205911ffa671 100644 (file)
--- 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',