CHANGES, copyright

(cherry picked from commit f7d346357e93433947e953fb4fdfe736e3a283cb)

diff --git a/CHANGES b/CHANGES
index d7f1a0dad82e0c2ba8c53c28610ce5aa36f6af0f..cc9027b024958148fe800b76c331b72f8787e773 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 14342296594e11c68f6c7e0a467aa18dcc491d68..39c2166fd35576dcb3359d5561a64fec2ed3613a 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1115,7 +1115,7 @@ setup(void) {
        isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
                      NAMED_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(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 540cc981aebbd17f526dd35fe04ef60c222278ed..acfa036760bd07a8307ac56ad33a3e2be34b3db7 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -636,8 +636,8 @@ cfg_parse_buffer3(cfg_parser_t *pctx, isc_buffer_t *buffer,
 
 isc_result_t
 cfg_parse_buffer4(cfg_parser_t *pctx, isc_buffer_t *buffer,
-                  const char *file, unsigned int line,
-                  const cfg_type_t *type, unsigned int flags,
+                 const char *file, unsigned int line,
+                 const cfg_type_t *type, unsigned int flags,
                  cfg_obj_t **ret)
 {
        isc_result_t result;
@@ -1728,19 +1728,19 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
                    (clause->flags & CFG_CLAUSEFLAG_DEPRECATED) != 0)
                {
                        cfg_parser_warning(pctx, 0, "option '%s' is deprecated",
-                                          clause->name);
+                                          clause->name);
                }
                if ((clause->flags & CFG_CLAUSEFLAG_OBSOLETE) != 0) {
                        cfg_parser_warning(pctx, 0, "option '%s' is obsolete",
-                                          clause->name);
+                                          clause->name);
                }
                if ((clause->flags & CFG_CLAUSEFLAG_NOTIMP) != 0) {
                        cfg_parser_warning(pctx, 0, "option '%s' is "
-                                          "not implemented", clause->name);
+                                          "not implemented", clause->name);
                }
                if ((clause->flags & CFG_CLAUSEFLAG_NYI) != 0) {
                        cfg_parser_warning(pctx, 0, "option '%s' is "
-                                          "not implemented", clause->name);
+                                          "not implemented", clause->name);
                }
                if ((clause->flags & CFG_CLAUSEFLAG_NOOP) != 0) {
                        cfg_parser_warning(pctx, 0, "option '%s' was not "

diff --git a/util/copyrights b/util/copyrights
index fc690558b1ccec61316fbc85ba39aad8de061b57..c7d0b4f32668cc69407e253d58cde32137bea109 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -670,6 +670,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