CHANGES, copyright

(cherry picked from commit f7d346357e93433947e953fb4fdfe736e3a283cb)

diff --git a/CHANGES b/CHANGES
index c6b25f0046cb08cc8dc6c45cbadb2df9d188bb69..890eacdd0befd3ec590c45419a423f95f0f39cc5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4980.  [bug]           Named-checkconf failed to detect bad in-view targets.
+                       [GL #288]
+
 4979.  [bug]           Non-libcap builds were not checking whether all
                        requested capabilities are present in the permitted
                        capability set. [GL #321]

diff --git a/bin/named/main.c b/bin/named/main.c
index 10744f97ec6dd7bc8395f90a86bd7e9589332285..bb639d98c695b9282a17e55d5a0a4bc921ece48c 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1107,7 +1107,7 @@ setup(void) {
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
                      NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
                      "compiled with OpenSSL version: %s",
-                     OPENSSL_VERSION_TEXT);
+                     OPENSSL_VERSION_TEXT);
 #if !defined(LIBRESSL_VERSION_NUMBER) && \
     OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,

diff --git a/util/copyrights b/util/copyrights
index b3e95aa809b42083399e779bb831affcc8fa3bd6..40b258fb15fef53ed09d20c71d94efdc55843bd7 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -756,6 +756,7 @@
 ./bin/tests/system/checkconf/bad-sharedwritable2.conf  CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/bad-sharedzone1.conf      CONF-C  2013,2016,2018
 ./bin/tests/system/checkconf/bad-sharedzone2.conf      CONF-C  2013,2016,2018
+./bin/tests/system/checkconf/bad-sharedzone3.conf      CONF-C  2018
 ./bin/tests/system/checkconf/bad-tsig.conf     CONF-C  2012,2013,2016,2018
 ./bin/tests/system/checkconf/bad-update-policy1.conf   CONF-C  2018
 ./bin/tests/system/checkconf/bad-update-policy2.conf   CONF-C  2018