Fallback to built in trust-anchors, managed-keys, or trusted-keys

if the bind.keys file cannot be parsed.

diff --git a/CHANGES b/CHANGES
index de17a40db217a13bdaa09e1feea45214f42a1569..10f2d0fcc801d1865808bb96c0dcac52b46d6e07 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5465.  [func]          Fallback to built in trust-anchors, managed-keys, or
+                       trusted-keys if the bindkeys-file (bind.keys) cannot
+                       be parsed. [GL #1235]
+
 5464.  [bug]           Specifying saving more than 128 files when rolling
                        dnstap / log files would cause buffer overflow.
                        [GL #1989]

diff --git a/bin/named/server.c b/bin/named/server.c
index e84a8b0f8d972bbea7b536fbe9c11c94348d5f5e..09b6717331e0081745e6247b6d46e61411712035 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8378,7 +8378,14 @@ load_configuration(const char *filename, named_server_t *server,
 
                result = cfg_parse_file(bindkeys_parser, server->bindkeysfile,
                                        &cfg_type_bindkeys, &bindkeys);
-               CHECK(result);
+               if (result != ISC_R_SUCCESS) {
+                       isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+                                     NAMED_LOGMODULE_SERVER, ISC_LOG_INFO,
+                                     "unable to parse '%s' error '%s'; using "
+                                     "built-in keys instead",
+                                     server->bindkeysfile,
+                                     isc_result_totext(result));
+               }
        } else {
                isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
                              NAMED_LOGMODULE_SERVER, ISC_LOG_INFO,