From 0c5ab7563ac799a97505b19340110d47f136d6a3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 24 Apr 2019 09:06:08 +1000 Subject: [PATCH 1/2] conditionally include (cherry picked from commit eee8084734d73588e76bab97ff7b8341519bf1a9) --- bin/named/unix/dlz_dlopen_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index 1a3e6e4f38..94c8869628 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -17,7 +17,9 @@ #include #include #include +#if HAVE_DLFCN_H #include +#endif #include #include From c7bf78d52d583fd141ecaa52d646dff47645e0ea Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 24 Apr 2019 09:07:19 +1000 Subject: [PATCH 2/2] add CHANGES (cherry picked from commit 19e40981394093ba62eb6c656489b5ef7ed32406) --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index dd70abdeb6..20e9185167 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +5218. [bug] Conditionally include . [GL #995] + 5217. [bug] Restore key id calculation for RSAMD5. [GL #996] 5215. [bug] Change #5124 was incomplete; named could still