From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 25 Mar 2015 05:25:53 +0000 (+0530)
Subject: Send notifies immediately for slave zones during startup (#38843)
X-Git-Tag: v9.11.0a1~906
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9a7532f83618b5abbfd7db59be77e451647ecbf2;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 0aaceb68212..8ff0bf79e24 100644
--- 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 e2419cc639d..73f4221f39d 100644
--- 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 */