- Fix that the zone acquired timestamp is set after the

  zonefile is read.

diff --git a/daemon/remote.c b/daemon/remote.c
index edf3799125564283ef29a0cfcad387d6bd9550e5..e10dadde78620750f0e873615428915e46f7ca9e 100644 (file)
--- 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;
                }
                        (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->lease_time = *worker->env.now;

+                       xfr->soa_zone_acquired = *worker->env.now;
+               }

                lock_basic_unlock(&xfr->lock);
        }
                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);
 
        auth_zone_verify_zonemd(z, &worker->env, &worker->env.mesh->mods,
                &reason, 0, 0);

diff --git a/doc/Changelog b/doc/Changelog
index 0391e057f4594639d15ac00296a8b31bfd8282b2..c10ba67af0e47849f4d1293bbe10097cf8e1b966 100644 (file)
--- 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.
        - 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,
 
 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 ceb933bbb9363a2bd42ada98a430fa1bba051ed5..d38cf9d266223661d061517d5807153d1e5490ce 100644 (file)
--- 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.
 
 /**
  * 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,
  * @param env: environment of the worker, with current time.
  */
 void auth_zone_pickup_initial_zone(struct auth_zone* z,