From 7b4315b7a60e1859103ec9289d5bd2983639173e Mon Sep 17 00:00:00 2001 From: Mark Andrews 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 2c354f565e..7496256471 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -9512,11 +9512,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; } @@ -9537,11 +9536,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; } @@ -9691,8 +9689,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; } @@ -9701,10 +9699,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 955874f0bcc6179de1a8f9c64bcdbac9a0714f38 Mon Sep 17 00:00:00 2001 From: Mark Andrews 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 7496256471..dc9c5b1c87 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -228,9 +228,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