mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Trim the effective expire time based on expire option

Browse Source 
and use that adjusted time to set the modification times.
This commit is contained in:
Mark Andrews 2023-07-03 17:10:28 +10:00
parent 0b4200c010
commit b04d941354
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/dns/zone.c
View File

@ -17080,11 +17080,11 @@ zone_detachdb(dns_zone_t *zone) {
static void static void
zone_xfrdone(dns_zone_t *zone, uint32_t *expireopt, isc_result_t result) { zone_xfrdone(dns_zone_t *zone, uint32_t *expireopt, isc_result_t result) {
isc_time_t now; isc_time_t now, expiretime;
bool again = false; bool again = false;
unsigned int soacount; unsigned int soacount;
unsigned int nscount; unsigned int nscount;
uint32_t serial, refresh, retry, expire, minimum, soattl; uint32_t serial, refresh, retry, expire, minimum, soattl, oldexpire;
isc_result_t xfrresult = result; isc_result_t xfrresult = result;
bool free_needed; bool free_needed;
dns_zone_t *secure = NULL; dns_zone_t *secure = NULL;
@ -17136,6 +17136,8 @@ again:
goto same_primary; goto same_primary;
} }
oldexpire = zone->expire;
/* /*
* Update the zone structure's data from the actual * Update the zone structure's data from the actual
* SOA received. * SOA received.
@ -17188,19 +17190,31 @@ again:
} }
/* /*
* Set our next update/expire times. * Set our next refresh time.
*/ */
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDREFRESH)) { if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDREFRESH)) {
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDREFRESH); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDREFRESH);
zone->refreshtime = now; zone->refreshtime = now;
DNS_ZONE_TIME_ADD(&now, zone->expire,
&zone->expiretime);
} else { } else {
DNS_ZONE_JITTER_ADD(&now, zone->refresh, DNS_ZONE_JITTER_ADD(&now, zone->refresh,
&zone->refreshtime); &zone->refreshtime);
DNS_ZONE_TIME_ADD(&now, zone->expire,
&zone->expiretime);
} }
/*
* Set our next expire time. If the parent returned
* an EXPIRE option use that to update zone->expiretime.
*/
expire = zone->expire;
if (expireopt != NULL && *expireopt < expire) {
expire = *expireopt;
}
DNS_ZONE_TIME_ADD(&now, expire, &expiretime);
if (oldexpire != zone->expire ||
isc_time_compare(&expiretime, &zone->expiretime) > 0)
{
zone->expiretime = expiretime;
}
if (result == ISC_R_SUCCESS && xfrresult == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS && xfrresult == ISC_R_SUCCESS) {
char buf[DNS_NAME_FORMATSIZE + sizeof(": TSIG ''")]; char buf[DNS_NAME_FORMATSIZE + sizeof(": TSIG ''")];
if (zone->tsigkey != NULL) { if (zone->tsigkey != NULL) {
@ -17227,15 +17241,27 @@ again:
*/ */
if (zone->masterfile != NULL || zone->journal != NULL) { if (zone->masterfile != NULL || zone->journal != NULL) {
unsigned int delay = DNS_DUMP_DELAY; unsigned int delay = DNS_DUMP_DELAY;
isc_interval_t i;
isc_time_t when;
/*
* Compute effective modification time.
*/
isc_interval_set(&i, zone->expire, 0);
result = isc_time_subtract(&zone->expiretime, &i,
&when);
if (result != ISC_R_SUCCESS) {
when = now;
}
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
if (zone->journal != NULL) { if (zone->journal != NULL) {
result = isc_file_settime(zone->journal, &now); result = isc_file_settime(zone->journal, &when);
} }
if (result != ISC_R_SUCCESS && zone->masterfile != NULL) if (result != ISC_R_SUCCESS && zone->masterfile != NULL)
{ {
result = isc_file_settime(zone->masterfile, result = isc_file_settime(zone->masterfile,
&now); &when);
} }
if ((DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NODELAY) != 0) || if ((DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NODELAY) != 0) ||