diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2020-09-11 12:24:51 +1000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-10-27 08:22:03 +0000 |
| commit | 63d94da74a6592a8e465dda4c3b85c9024d9af46 (patch) | |
| tree | 805b4e7db74da64fbb01b55c6ac3eafebce8e8d9 /source4 | |
| parent | b5bc60e77d393b7deb55ba64f519ce91cd0cc265 (diff) | |
| download | samba-63d94da74a6592a8e465dda4c3b85c9024d9af46.tar.gz | |
bind9-dlz: Add support for BIND 9.14.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 a167a2154d4909e8e1f97d9f36d0e4c947f2d944)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dns_server/dlz_minimal.h | 3 | ||||
| -rw-r--r-- | source4/dns_server/wscript_build | 10 |
2 files changed, 13 insertions, 0 deletions
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', |