From 430a52883d2a14165f37b1848c842d765a95aaf1 Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Mon, 13 Jun 2022 16:25:40 -0700 Subject: [PATCH 1/3] corrected the opcode param to opcode_totext (cherry picked from commit 2b81a696593bdc406f0cadf2ec930118a86bf92c) --- lib/dns/zone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 0466d35ed2..990997b2cb 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -13232,7 +13232,7 @@ stub_glue_response_cb(isc_task_t *task, isc_event_t *event) { isc_buffer_t rb; isc_buffer_init(&rb, opcode, sizeof(opcode)); - (void)dns_opcode_totext(msg->rcode, &rb); + (void)dns_opcode_totext(msg->opcode, &rb); dns_zone_log(zone, ISC_LOG_INFO, "refreshing stub: " From 5068ee73d6d4d5cf7fb6760a0dee45a74269206d Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Mon, 13 Jun 2022 16:30:00 -0700 Subject: [PATCH 2/3] make the fix more complete (cherry picked from commit a58647df6a0afa188ed90c410d79ccfaeacfbf8b) --- lib/dns/zone.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 990997b2cb..f04bb5737b 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -13665,7 +13665,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) { isc_buffer_t rb; isc_buffer_init(&rb, opcode, sizeof(opcode)); - (void)dns_opcode_totext(msg->rcode, &rb); + (void)dns_opcode_totext(msg->opcode, &rb); dns_zone_log(zone, ISC_LOG_INFO, "refreshing stub: " @@ -14076,7 +14076,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { isc_buffer_t rb; isc_buffer_init(&rb, opcode, sizeof(opcode)); - (void)dns_opcode_totext(msg->rcode, &rb); + (void)dns_opcode_totext(msg->opcode, &rb); dns_zone_log(zone, ISC_LOG_INFO, "refresh: " @@ -18336,7 +18336,7 @@ forward_callback(isc_task_t *task, isc_event_t *event) { isc_buffer_t rb; isc_buffer_init(&rb, opcode, sizeof(opcode)); - (void)dns_opcode_totext(msg->rcode, &rb); + (void)dns_opcode_totext(msg->opcode, &rb); dns_zone_log(zone, ISC_LOG_INFO, "forwarding dynamic update: " From 2a4bdcd8a320b642112bbb91c893712cdceda4a3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 14 Jun 2022 10:31:47 +1000 Subject: [PATCH 3/3] Add CHANGES note for [GL !6420] (cherry picked from commit bd508194be16e8f13911e7489bea8e4206fbfd5f) --- CHANGES | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index 961f3c35ff..ee5f6d52ee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +5903. [bug] When named checks that the OPCODE in a response matches + that of the request, if there is a mismatch named logs + an error. Some of those error messages incorrectly + used RCODE instead of OPCODE to lookup the nemonic. + This has been corrected. [GL !6420] + 5901. [bug] When processing a catalog zone member zone make sure that there is no configured pre-existing forward-only forward zone with that name. [GL #2506]