mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 08:35:31 +00:00
Code Issues Releases Wiki Activity

2024. [bug] named emited spurious "zone serial unchanged"

Browse Source 
messages on reload. [RT #16027]
This commit is contained in:
Mark Andrews
2006-05-18 02:03:37 +00:00
parent a9365554b6
commit f04809663f
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2024. [bug] named emited spurious "zone serial unchanged"
messages on reload. [RT #16027]
2023. [bug] "make install" should create ${localstatedir}/run and 2023. [bug] "make install" should create ${localstatedir}/run and
${sysconfdir} if they do not exist. [RT #16033] ${sysconfdir} if they do not exist. [RT #16033]

14
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.453 2006/02/28 02:39:51 marka Exp $ */ /* $Id: zone.c,v 1.454 2006/05/18 02:03:37 marka Exp $ */
/*! \file */ /*! \file */
@@ -1138,7 +1138,7 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
result = isc_file_getmodtime(zone->masterfile, &filetime); result = isc_file_getmodtime(zone->masterfile, &filetime);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE) && if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE) &&
isc_time_compare(&filetime, &zone->loadtime) < 0) { isc_time_compare(&filetime, &zone->loadtime) <= 0) {
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_log(zone, ISC_LOG_DEBUG(1),
"skipping load: master file " "skipping load: master file "
"older than last load"); "older than last load");
@@ -1151,6 +1151,16 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
INSIST(zone->db_argc >= 1); INSIST(zone->db_argc >= 1);
/*
* Built in zones don't need to be reloaded.
*/
if (zone->type == dns_zone_master &&
strcmp(zone->db_argv[0], "_builtin") == 0 &&
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
result = ISC_R_SUCCESS;
goto cleanup;
}
if ((zone->type == dns_zone_slave || zone->type == dns_zone_stub) && if ((zone->type == dns_zone_slave || zone->type == dns_zone_stub) &&
(strcmp(zone->db_argv[0], "rbt") == 0 || (strcmp(zone->db_argv[0], "rbt") == 0 ||
strcmp(zone->db_argv[0], "rbt64") == 0)) { strcmp(zone->db_argv[0], "rbt64") == 0)) {