From 76d6b3c544c790037a2ca8b74096db7f68ddaef3 Mon Sep 17 00:00:00 2001
From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 25 Mar 2015 10:55:53 +0530
Subject: [PATCH] Send notifies immediately for slave zones during startup
 (#38843)

(cherry picked from commit 9a7532f83618b5abbfd7db59be77e451647ecbf2)
---
 CHANGES        | 3 +++
 lib/dns/zone.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b3b4263521..db6695d681 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 9997a2d258..f1b43ecf3a 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -12202,7 +12202,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 */