Commit 2120268f authored by Mark Andrews's avatar Mark Andrews

Merge branch '1235-system-tests-fail-with-new-etc-bind-keys-installed-v9_11' into 'v9_11'

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

See merge request !3844
parents db869016 55f567ab
Pipeline #46638 passed with stages
in 3 minutes and 21 seconds
5465. [func] Fallback to built in trust-anchors, managed-keys, or
trusted-keys if the bindkeys-file (bind.keys) cannot
be parsed. [GL #1235]
5463. [bug] Address potential NULL pointer dereference on out of
memory in dnstap.c. [GL #2010]
......
......@@ -7583,7 +7583,14 @@ load_configuration(const char *filename, ns_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(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_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(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER, ISC_LOG_INFO,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment