From f2f36a2733e6a09d2a158f3f680ddea5888eff0a Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Fri, 22 Aug 2025 14:06:51 +0200 Subject: [PATCH] - Fix that the zone acquired timestamp is set after the zonefile is read. --- daemon/remote.c | 5 ++++- doc/Changelog | 2 ++ services/authzone.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index edf379912..e10dadde7 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3221,10 +3221,13 @@ do_auth_zone_reload(RES* ssl, struct worker* worker, char* arg) (void)ssl_printf(ssl, "error: no SOA in zone after read %s\n", arg); return; } - if(xfr->have_zone) + if(xfr->have_zone) { xfr->lease_time = *worker->env.now; + xfr->soa_zone_acquired = *worker->env.now; + } lock_basic_unlock(&xfr->lock); } + z->soa_zone_acquired = *worker->env.now; auth_zone_verify_zonemd(z, &worker->env, &worker->env.mesh->mods, &reason, 0, 0); diff --git a/doc/Changelog b/doc/Changelog index 0391e057f..c10ba67af 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,8 @@ - For #1318: Fix compile warnings for DoH compile on windows. - Fix sha1 enable environment variable in test code on windows. - Fix #1319: [FR] zone status for Unbound auth-zones. + - Fix that the zone acquired timestamp is set after the + zonefile is read. 21 August 2025: Wouter - Fix to check for extraneous command arguments for unbound-control, diff --git a/services/authzone.h b/services/authzone.h index ceb933bbb..d38cf9d26 100644 --- a/services/authzone.h +++ b/services/authzone.h @@ -806,7 +806,7 @@ void auth_xfer_pickup_initial_zone(struct auth_xfer* x, /** * Initial pick up of the auth zone, it sets the acquired time. - * @param z: the zone, locked by caller. + * @param z: the zone, write locked by caller. * @param env: environment of the worker, with current time. */ void auth_zone_pickup_initial_zone(struct auth_zone* z, -- 2.47.2