From: Aram Sargsyan <aram@isc.org>
Date: Mon, 30 Jun 2025 13:12:09 +0000 (+0000)
Subject: Log dropped or slipped responses in the query-errors category
X-Git-Tag: v9.21.11~56^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27e7961479ccf365147abe47db848952ddbc8809;p=thirdparty%2Fbind9.git

Log dropped or slipped responses in the query-errors category

As mentioned in the comments block before the changed code block,
the dropped or slipped responses should be logged in the query
category (or rather query-errors category as done in lib/ns/client.c),
so that requests are not silently lost.

Also fix a couple of errors/typos in the code comments.
---

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 92c6172c7bf..ba30d4a4177 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -938,10 +938,10 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 			wouldlog, log_buf, sizeof(log_buf));
 		if (rrl_result != DNS_RRL_RESULT_OK) {
 			/*
-			 * Log dropped errors in the query category
+			 * Log dropped errors in the query-errors category
 			 * so that they are not lost in silence.
 			 * Starts of rate-limited bursts are logged in
-			 * NS_LOGCATEGORY_RRL.
+			 * DNS_LOGCATEGORY_RRL.
 			 */
 			if (wouldlog) {
 				ns_client_log(client,
diff --git a/lib/ns/query.c b/lib/ns/query.c
index 3de9454d30a..fed31716360 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -6945,7 +6945,7 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) {
 			sizeof(log_buf));
 		if (rrl_result != DNS_RRL_RESULT_OK) {
 			/*
-			 * Log dropped or slipped responses in the query
+			 * Log dropped or slipped responses in the query-errors
 			 * category so that requests are not silently lost.
 			 * Starts of rate-limited bursts are logged in
 			 * DNS_LOGCATEGORY_RRL.
@@ -6955,7 +6955,8 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) {
 			 * with other truncated responses in RespTruncated.
 			 */
 			if (wouldlog) {
-				ns_client_log(qctx->client, DNS_LOGCATEGORY_RRL,
+				ns_client_log(qctx->client,
+					      NS_LOGCATEGORY_QUERY_ERRORS,
 					      NS_LOGMODULE_QUERY,
 					      DNS_RRL_LOG_DROP, "%s", log_buf);
 			}