From 8f016dd57a920fe4bec09a0f49ce82713b0b1cf6 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 18 Feb 2021 15:33:17 +1100 Subject: [PATCH 1/2] Fixed librpz_dnsrpzd_path being a duplicate symbol librpz_dnsrpzd_path should have been declared extern in dns/librpz.h --- lib/dns/include/dns/librpz.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index 85b55cdebf..47793c63d6 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -781,7 +781,7 @@ LIBDEF_F(su2str) /** * default path to dnsrpzd */ -const char *librpz_dnsrpzd_path; +LIBDEF(const char *, librpz_dnsrpzd_path) #undef LIBDEF From e12cf5eb5789f82b0dba488811b7f9db2b7e9aeb Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 18 Feb 2021 15:40:13 +1100 Subject: [PATCH 2/2] Add CHANGES for [GL #2298] --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 26b7f355e4..7895c2edf0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5594. [bug] Building with --enable-dnsrps --enable-dnsrps-dl failed. + [GL #2298] + 5593. [bug] Journal files written by older versions of named can now be read when loading zones so that journal incompatibility will not cause problems on upgrade.