From 65d7427b172aa3ac897556e0a0ceb5054e18a2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Thu, 11 Aug 2022 11:41:30 +0200 Subject: [PATCH 1/2] Reset parser before parsing of internal trust anchor It might be reused if /etc/bind.keys exists, but failed correct parsing. Release traces of previous parsing attempt of different data. --- bin/delv/delv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/delv/delv.c b/bin/delv/delv.c index bfdc975e88..f83501578c 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -845,6 +845,7 @@ setup_dnsseckeys(dns_client_t *client) { isc_buffer_init(&b, anchortext, sizeof(anchortext) - 1); isc_buffer_add(&b, sizeof(anchortext) - 1); + cfg_parser_reset(parser); result = cfg_parse_buffer(parser, &b, NULL, 0, &cfg_type_bindkeys, 0, &bindkeys); if (result != ISC_R_SUCCESS) { From dc8fcbf0134a7188eb5ebf0c52167abcd949ac61 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 19 Aug 2022 14:38:32 +1000 Subject: [PATCH 2/2] Add CHANGES entry for [GL !6468] --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 27471917d1..615f80a34c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5945. [bug] If parsing /etc/bind.key failed, delv could assert + when trying to parse the built in trust anchors as + the parser hadn't been reset. [GL !6468] + 5944. [bug] Fix +http-plain-get and +http-plain-post options support in dig. Thanks to Marco Davids at SIDN for reporting the problem. [GL !6672]