summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2020-09-11 12:34:07 +1000
committerKarolin Seeger <kseeger@samba.org>2020-10-27 08:22:03 +0000
commitf6b6867d5497d2805346fe28efadb3ba63fc3d97 (patch)
tree61ac5b50dbbd28f242ee25c92f7b49adf3e04af2 /source4
parent345137381553ccdcaf1fd3831049172a4818a5f7 (diff)
downloadsamba-f6b6867d5497d2805346fe28efadb3ba63fc3d97.tar.gz
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)
Diffstat (limited to 'source4')
-rw-r--r--source4/dns_server/dlz_minimal.h3
-rw-r--r--source4/dns_server/wscript_build10
2 files changed, 13 insertions, 0 deletions
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',