From a5ddeca38c153c138d581ef096930fc359443b3b Mon Sep 17 00:00:00 2001 From: Jeroen Koekkoek Date: Mon, 28 Oct 2024 15:06:31 +0100 Subject: [PATCH] Treat a mismatch in RRset TTLs as a warning Fixes #396. --- doc/ChangeLog | 3 +++ doc/RELNOTES | 1 + zonec.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index cf8da42d..5e1198f8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,6 @@ +28 October 2024: Jeroen + - Fix #396: Treat a mismatch in RRset TTLs as a warning. + 24 October 2024: Wouter - Fix #392: Inconsistent documentation about control-interface. - Merge #395: Explain the zonefile example better. diff --git a/doc/RELNOTES b/doc/RELNOTES index de0d31c6..9c8d9075 100644 --- a/doc/RELNOTES +++ b/doc/RELNOTES @@ -23,6 +23,7 @@ BUG FIXES: - Merge #395: Explain the zonefile example better. - Merge #394: Fix the path to use doc/manual/. - Fix analyzer issue in do_print_cookie_secrets to check for failure. + - Treat a mismatch in RRset TTLs as a warning. 4.10.1 ================ diff --git a/zonec.c b/zonec.c index f9137838..ac829997 100644 --- a/zonec.c +++ b/zonec.c @@ -267,7 +267,7 @@ int32_t zonec_accept( } else { struct rr *rrs; if (type != TYPE_RRSIG && ttl != rrset->rrs[0].ttl) { - zone_log(parser, priority, "%s TTL %"PRIu32" does not match TTL %u of %s RRset", + zone_log(parser, ZONE_WARNING, "%s TTL %"PRIu32" does not match TTL %u of %s RRset", domain_to_string(domain), ttl, rrset->rrs[0].ttl, rrtype_to_string(type)); }