From 0c1dc9a3eb402a7ece370ef801625067a8958c93 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 2 Sep 2025 15:48:35 +1000
Subject: [PATCH 1/2] re-split log message text

(cherry picked from commit a64c35052363f659ef589a87a49cca4281d99379)
---
 lib/dns/resolver.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 7163b54a8b..abb6d5372d 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -9036,11 +9036,10 @@ rctx_authority_negative(respctx_t *rctx) {
 					if (rctx->ns_name != NULL &&
 					    name != rctx->ns_name)
 					{
-						log_formerr(fctx, "multiple NS "
-								  "RRsets "
-								  "in "
-								  "authority "
-								  "section");
+						log_formerr(
+							fctx,
+							"multiple NS RRsets in "
+							"authority section");
 						rctx->result = DNS_R_FORMERR;
 						return ISC_R_COMPLETE;
 					}
@@ -9061,11 +9060,10 @@ rctx_authority_negative(respctx_t *rctx) {
 					if (rctx->soa_name != NULL &&
 					    name != rctx->soa_name)
 					{
-						log_formerr(fctx, "multiple "
-								  "SOA RRs "
-								  "in "
-								  "authority "
-								  "section");
+						log_formerr(
+							fctx,
+							"multiple SOA RRs in "
+							"authority section");
 						rctx->result = DNS_R_FORMERR;
 						return ISC_R_COMPLETE;
 					}
@@ -9215,8 +9213,8 @@ rctx_authority_dnssec(respctx_t *rctx) {
 				 * one DS RRset.
 				 */
 				if (rctx->ns_name == NULL) {
-					log_formerr(fctx, "DS with no "
-							  "referral");
+					log_formerr(fctx,
+						    "DS with no referral");
 					rctx->result = DNS_R_FORMERR;
 					return ISC_R_COMPLETE;
 				}
@@ -9225,10 +9223,9 @@ rctx_authority_dnssec(respctx_t *rctx) {
 					if (rctx->ds_name != NULL &&
 					    name != rctx->ds_name)
 					{
-						log_formerr(fctx, "DS doesn't "
-								  "match "
-								  "referral "
-								  "(NS)");
+						log_formerr(fctx,
+							    "DS doesn't match "
+							    "referral (NS)");
 						rctx->result = DNS_R_FORMERR;
 						return ISC_R_COMPLETE;
 					}

From 2ce20f6e491dc1335e529bf0a77e3833faff8188 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 2 Sep 2025 15:49:43 +1000
Subject: [PATCH 2/2] re-split STATIC_ASSERT message

(cherry picked from commit ccc41c70445d41eed9341f255a2c9fcfadbeee00)
---
 lib/dns/resolver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index abb6d5372d..d64f71486a 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -243,9 +243,9 @@
 #define NS_PROCESSING_LIMIT 20
 
 STATIC_ASSERT(NS_PROCESSING_LIMIT > NS_RR_LIMIT,
-	      "The maximum number of NS RRs processed for each delegation "
-	      "(NS_PROCESSING_LIMIT) must be larger than the large delegation "
-	      "threshold (NS_RR_LIMIT).");
+	      "The maximum number of NS RRs processed for each "
+	      "delegation (NS_PROCESSING_LIMIT) must be larger than the large "
+	      "delegation threshold (NS_RR_LIMIT).");
 
 /* Hash table for zone counters */
 #ifndef RES_DOMAIN_HASH_BITS