upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 09:42:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

2719. [func] Skip trusted/managed keys for unsupported algorithms.

Browse source 
[RT #20392]
This commit is contained in:
Mark Andrews 2009-10-20 03:15:06 +00:00
parent 3c5e54941f
commit 06e7340198
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
2719. [func] Skip trusted/managed keys for unsupported algorithms.
[RT #20392]
2718. [bug] The space calculations in opensslrsa_todns() were
incorrect. [RT #20394]

17
bin/named/server.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.551 2009/10/12 20:48:11 each Exp $ */
/* $Id: server.c,v 1.552 2009/10/20 03:15:06 marka Exp $ */
/*! \file */
@ -552,6 +552,11 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key,
"ignoring %s key for '%s': no crypto support",
managed ? "managed" : "trusted",
keynamestr);
} else if (result == DST_R_UNSUPPORTEDALG) {
cfg_obj_log(key, ns_g_lctx, ISC_LOG_WARNING,
"skipping %s key for '%s': %s",
managed ? "managed" : "trusted",
keynamestr, isc_result_totext(result));
} else {
cfg_obj_log(key, ns_g_lctx, ISC_LOG_ERROR,
"configuring %s key for '%s': %s",
@ -584,8 +589,14 @@ load_view_keys(const cfg_obj_t *keys, const cfg_obj_t *vconfig,
elt2 != NULL;
elt2 = cfg_list_next(elt2)) {
key = cfg_listelt_value(elt2);
CHECK(dstkey_fromconfig(vconfig, key, managed,
&dstkey, mctx));
result = dstkey_fromconfig(vconfig, key, managed,
&dstkey, mctx);
if (result == DST_R_UNSUPPORTEDALG) {
result = ISC_R_SUCCESS;
continue;
}
if (result != ISC_R_SUCCESS)
goto cleanup;
CHECK(dns_keytable_add(view->secroots, managed,
&dstkey));
}