upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

treat the signed instance of a inline zone as dynamic

Browse source
This commit is contained in:
Mark Andrews 2018-07-26 13:59:22 +10:00
parent cfccd8d246
commit 9130f055f4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/zone.c
View file

@ -1722,6 +1722,10 @@ dns_zone_isdynamic(dns_zone_t *zone, isc_boolean_t ignore_freeze) {
(zone->type == dns_zone_redirect && zone->masters != NULL))
return (ISC_TRUE);
/* Inline zones are always dynamic. */
if (zone->type == dns_zone_master && zone->raw != NULL)
return (ISC_TRUE);
/* If !ignore_freeze, we need check whether updates are disabled. */
if (zone->type == dns_zone_master &&
(!zone->update_disabled || ignore_freeze) &&
@ -1918,7 +1922,7 @@ zone_load(dns_zone_t *zone, unsigned int flags, isc_boolean_t locked) {
* zone being reloaded. Do nothing - the database
* we already have is guaranteed to be up-to-date.
*/
if (zone->type == dns_zone_master)
if (zone->type == dns_zone_master && !hasraw)
result = DNS_R_DYNAMIC;
else
result = ISC_R_SUCCESS;
@ -1962,7 +1966,6 @@ zone_load(dns_zone_t *zone, unsigned int flags, isc_boolean_t locked) {
goto cleanup;
}
/*
* If the file modification time is in the past
* set loadtime to that value.
@ -4632,6 +4635,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
isc_uint32_t serialmin, serialmax;
INSIST(zone->type == dns_zone_master);
INSIST(zone->raw == NULL);
if (serial == oldserial &&
zone_unchanged(zone->db, db, zone->mctx)) {