Send notifies immediately for slave zones during startup (#38843)

diff --git a/CHANGES b/CHANGES
index 0aaceb68212a63202d0a6f6c9f6554273ba0ed11..8ff0bf79e2457985a1a602c872067bfc9b856cd5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4089.  [bug]           Send notifies immediately for slave zones during
+                       startup. [RT #38843]
+
 4088.  [port]          Fixed errors when building with libressl. [RT #38899]
 
 4087.  [bug]           Fix a crash due to use-after-free due to sequencing

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e2419cc639d8e7acf1d90f1a16e5abbe1dbcaa79..73f4221f39d9a2106207f87a58a3ecec4ae966f8 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -12343,7 +12343,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
 
        case dns_zone_slave:
        treat_as_slave:
-               if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY))
+               if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) ||
+                   DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY))
                        next = zone->notifytime;
                /* FALLTHROUGH */