From 5f777e6a49e2cd68ec4da5bf76723f461ad1d157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 20 Jun 2019 12:39:34 +0200 Subject: [PATCH 1/2] Revert "Downgrade the dns_clientinfomethod structure to the version in lib/dns/clientinfo.c" This reverts commit a6f09b2255e323d8c49306ef0af6b4f7565baa61. (cherry picked from commit 04961a7e6b62fa2d7846097be6de34021d71706a) --- contrib/dlz/modules/include/dlz_minimal.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h index e2cbb53490..05ae3b271a 100644 --- a/contrib/dlz/modules/include/dlz_minimal.h +++ b/contrib/dlz/modules/include/dlz_minimal.h @@ -121,12 +121,13 @@ typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client, typedef isc_result_t (*dns_clientinfo_version_t)(dns_clientinfo_t *client, void **addrp); -#define DNS_CLIENTINFOMETHODS_VERSION 1 -#define DNS_CLIENTINFOMETHODS_AGE 0 +#define DNS_CLIENTINFOMETHODS_VERSION 2 +#define DNS_CLIENTINFOMETHODS_AGE 1 typedef struct dns_clientinfomethods { uint16_t version; uint16_t age; dns_clientinfo_sourceip_t sourceip; + dns_clientinfo_version_t dbversion; } dns_clientinfomethods_t; #endif /* DLZ_DLOPEN_VERSION > 1 */ From 5de88e29f877b94c098842500683ed3c5b399e2a Mon Sep 17 00:00:00 2001 From: Brian Conry Date: Tue, 18 Jun 2019 14:37:20 -0500 Subject: [PATCH 2/2] Bump DNS_CLIENTINFOMETHODS_VERSION/_AGE to 2/1 in clientinfo.h BIND 9.11.0 has bumped DNS_CLIENTINFOMETHODS_VERSION and _AGE to version 2 and 1 in the dlz_minimal.h because a member was addet to the dnsclientinfo struct. It was found out that the new member is not used anywhere and there are no accessor functions therefore the change was reverted. Later on, it was found out that the revert caused some problems to the users of BIND 9, and thus this changes takes a different approach by syncing the values other way around. (cherry picked from commit 39344dfb3e7a7a734c5d830f18884a636bfd6f5d) --- lib/dns/include/dns/clientinfo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h index 30e29c8801..1d85ec45bf 100644 --- a/lib/dns/include/dns/clientinfo.h +++ b/lib/dns/include/dns/clientinfo.h @@ -58,8 +58,8 @@ typedef struct dns_clientinfo { typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client, isc_sockaddr_t **addrp); -#define DNS_CLIENTINFOMETHODS_VERSION 1 -#define DNS_CLIENTINFOMETHODS_AGE 0 +#define DNS_CLIENTINFOMETHODS_VERSION 2 +#define DNS_CLIENTINFOMETHODS_AGE 1 typedef struct dns_clientinfomethods { uint16_t version;