From: Vladimír Čunát Date: Fri, 24 Jul 2026 12:12:04 +0000 (+0200) Subject: lib/cache: fix excessive logging regression X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9327b8fab7f3e8b4e60dde2c146daa30e9fb80f;p=thirdparty%2Fknot-resolver.git lib/cache: fix excessive logging regression Regressed in 29b55ceb426efaa and annoyingly logging e.g.: > [cache ] [35589.02] stash failed, ret = 1 Example QNAME to trigger this: foo.bar.cloudflare.net --- diff --git a/NEWS b/NEWS index aebf36769..08ac8dfae 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Knot Resolver 6.4.2 (2026-08-dd) +================================ + +Bugfixes +-------- +- cache: avoid excessive logging introduced in the last release (!1869) + + Knot Resolver 6.4.1 (2026-07-22) ================================ diff --git a/lib/cache/api.c b/lib/cache/api.c index 3e2b99b0f..5e2fb7e51 100644 --- a/lib/cache/api.c +++ b/lib/cache/api.c @@ -556,15 +556,13 @@ static ssize_t stash_rrset(struct kr_cache *cache, const struct kr_query *qry, return kr_error(EINVAL); int ret = kr_ok(); - if (rrset_has_min_range_or_weird(rr, qry)) { - ret = kr_error(ERANGE); + if (rrset_has_min_range_or_weird(rr, qry)) goto return_needs_pkt; - } const int wild_labels = rr_sigs == NULL ? 0 : knot_dname_labels(rr->owner, NULL) - knot_rrsig_labels(rr_sigs->rrs.rdata); if (wild_labels < 0) { - ret = kr_error(ERANGE); + VERBOSE_MSG(qry, "=> invalid wildcard labels %d\n", wild_labels); goto return_needs_pkt; } const knot_dname_t *encloser = rr->owner; /**< the closest encloser name */ @@ -584,7 +582,7 @@ static ssize_t stash_rrset(struct kr_cache *cache, const struct kr_query *qry, signer_labels = MAX(signer_labels, l); } if (knot_dname_labels(encloser, NULL) < signer_labels) { - ret = kr_error(ERANGE); + VERBOSE_MSG(qry, "=> invalid wildcard labels %d\n", wild_labels); goto return_needs_pkt; } }