The branch, master has been updated via 1bccc67ce7c provision: BIND 9.17.x is not supported via 5b2ccb1c7ca provision: Add support for BIND 9.16.x via ca3c18a236d bind9-dlz: Add support for BIND 9.16.x via 4d097976520 provision: BIND 9.15.x is not supported via 016c1174ef7 provision: Add support for BIND 9.14.x via a167a2154d4 bind9-dlz: Add support for BIND 9.14.x via 95278618829 provision: BIND 9.13.x is not supported via cdb6c5d1eca bind9-dlz: Bind 9.13.x switched to using bool as isc_boolean_t instead of int. from 68b981ee8a1 ctdb/test_ceph_rados_reclock: check for service registration
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1bccc67ce7c6364a95fbfeb095938522671578a8 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Sep 14 09:45:50 2020 +1000 provision: BIND 9.17.x is not supported BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Thu Sep 24 05:55:43 UTC 2020 on sn-devel-184 commit 5b2ccb1c7cad5cded5dad37a18a7d42c1680b2f7 Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Sep 11 12:35:30 2020 +1000 provision: Add support for BIND 9.16.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> commit ca3c18a236dedfdfbf225dcfcd0418f1634d8759 Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Sep 11 12:34:07 2020 +1000 bind9-dlz: Add support for BIND 9.16.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> commit 4d09797652059c3ed5b2a4f94f2181ce14d39972 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Sep 14 09:45:04 2020 +1000 provision: BIND 9.15.x is not supported BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> commit 016c1174ef783990f93e348ee82f5c989c43cbbf Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Sep 11 12:26:21 2020 +1000 provision: Add support for BIND 9.14.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> commit a167a2154d4909e8e1f97d9f36d0e4c947f2d944 Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Sep 11 12:24:51 2020 +1000 bind9-dlz: Add support for BIND 9.14.x BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> commit 95278618829227632b2bcb29fc272e600607ea41 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon Sep 14 09:44:10 2020 +1000 provision: BIND 9.13.x is not supported BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> commit cdb6c5d1eca1c0f6967941dbd1da07be6b53d302 Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Sep 11 12:16:01 2020 +1000 bind9-dlz: Bind 9.13.x switched to using bool as isc_boolean_t instead of int. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Rowland Penny <rpe...@samba.org> ----------------------------------------------------------------------- Summary of changes: python/samba/provision/sambadns.py | 17 +++++++++++++++-- source4/dns_server/dlz_minimal.h | 24 +++++++++++++++++++++++- source4/dns_server/wscript_build | 20 ++++++++++++++++++++ source4/setup/named.conf.dlz | 6 ++++++ 4 files changed, 64 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index ffdb2559979..4aa132abfa6 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -962,6 +962,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_10 = '#' bind9_11 = '#' bind9_12 = '#' + bind9_14 = '#' + bind9_16 = '#' if bind_info.upper().find('BIND 9.8') != -1: bind9_8 = '' elif bind_info.upper().find('BIND 9.9') != -1: @@ -972,8 +974,18 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): bind9_11 = '' elif bind_info.upper().find('BIND 9.12') != -1: bind9_12 = '' + elif bind_info.upper().find('BIND 9.14') != -1: + bind9_14 = '' + elif bind_info.upper().find('BIND 9.16') != -1: + bind9_16 = '' elif bind_info.upper().find('BIND 9.7') != -1: raise ProvisioningError("DLZ option incompatible with BIND 9.7.") + elif bind_info.upper().find('BIND_9.13') != -1: + raise ProvisioningError("Only stable/esv releases of BIND are supported.") + elif bind_info.upper().find('BIND_9.15') != -1: + raise ProvisioningError("Only stable/esv releases of BIND are supported.") + elif bind_info.upper().find('BIND_9.17') != -1: + raise ProvisioningError("Only stable/esv releases of BIND are supported.") else: logger.warning("BIND version unknown, please modify %s manually." % paths.namedconf) setup_file(setup_path("named.conf.dlz"), paths.namedconf, { @@ -983,8 +995,9 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger): "BIND9_9": bind9_9, "BIND9_10": bind9_10, "BIND9_11": bind9_11, - "BIND9_12": bind9_12 - + "BIND9_12": bind9_12, + "BIND9_14": bind9_14, + "BIND9_16": bind9_16 }) diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h index 193904f4b2c..d991528d6ad 100644 --- a/source4/dns_server/dlz_minimal.h +++ b/source4/dns_server/dlz_minimal.h @@ -23,30 +23,47 @@ #ifndef DLZ_MINIMAL_H #define DLZ_MINIMAL_H 1 +#include <stdint.h> +#include <stdbool.h> + #if defined (BIND_VERSION_9_8) # define DLZ_DLOPEN_VERSION 1 #elif defined (BIND_VERSION_9_9) # define DLZ_DLOPEN_VERSION 2 # define DNS_CLIENTINFO_VERSION 1 +# define ISC_BOOLEAN_AS_BOOL 0 #elif defined (BIND_VERSION_9_10) # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 1 +# define ISC_BOOLEAN_AS_BOOL 0 #elif defined (BIND_VERSION_9_11) # define DLZ_DLOPEN_VERSION 3 # define DNS_CLIENTINFO_VERSION 2 +# define ISC_BOOLEAN_AS_BOOL 0 #elif defined (BIND_VERSION_9_12) # 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 +#elif defined (BIND_VERSION_9_16) +# define DLZ_DLOPEN_VERSION 3 +# define DNS_CLIENTINFO_VERSION 2 #else # error Unsupported BIND version #endif +#ifndef ISC_BOOLEAN_AS_BOOL +#define ISC_BOOLEAN_AS_BOOL 1 +#endif + #if DLZ_DLOPEN_VERSION > 1 # define DLZ_DLOPEN_AGE 0 #endif typedef unsigned int isc_result_t; -#if DLZ_DLOPEN_VERSION == 1 +#if ISC_BOOLEAN_AS_BOOL == 1 typedef bool isc_boolean_t; #else typedef int isc_boolean_t; @@ -72,8 +89,13 @@ typedef uint32_t dns_ttl_t; #define ISC_R_FILENOTFOUND 38 /* boolean values */ +#if ISC_BOOLEAN_AS_BOOL == 1 +#define ISC_TRUE true +#define ISC_FALSE false +#else #define ISC_TRUE 1 #define ISC_FALSE 0 +#endif /* log levels */ #define ISC_LOG_INFO (-1) diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build index 8a8466d096f..e97c85de44a 100644 --- a/source4/dns_server/wscript_build +++ b/source4/dns_server/wscript_build @@ -68,6 +68,26 @@ 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_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', diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz index 9341d7ea615..c2c41e2cddf 100644 --- a/source4/setup/named.conf.dlz +++ b/source4/setup/named.conf.dlz @@ -24,5 +24,11 @@ dlz "AD DNS Zone" { # For BIND 9.12.x ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so"; + + # For BIND 9.14.x + ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so"; + + # For BIND 9.16.x + ${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so"; }; -- Samba Shared Repository