From ed18f744963c431ff76489aa01ec6fc9fac137fb Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Sat, 28 Aug 2004 05:53:12 +0000
Subject: [PATCH] 1703.   [bug]           named would loop sending NOTIFY
 messages when it                         failed to receive a response. [RT
 #12322]

---
 CHANGES        | 3 ++-
 lib/dns/zone.c | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9bec73dc32..20bc724442 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@
 
 1704.	[placeholder]	rt12321
 
-1703.	[placeholder]	rt12322
+1703.	[bug]		named would loop sending NOTIFY messages when it
+			failed to receive a response. [RT #12322]
 
 1702.	[bug]		also-notify should not be applied to builtin zones.
 			[RT #12323]
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e729aff706..155fc71c79 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.419 2004/08/27 12:35:03 marka Exp $ */
+/* $Id: zone.c,v 1.420 2004/08/28 05:53:12 marka Exp $ */
 
 #include <config.h>
 
@@ -5180,9 +5180,8 @@ notify_done(isc_task_t *task, isc_event_t *event) {
 	 * the soa if we see a formerr and had sent a SOA.
 	 */
 	isc_event_free(&event);
-	if ((result == ISC_R_TIMEDOUT ||
-	     (message != NULL && message->rcode == dns_rcode_formerr &&
-	      (notify->flags & DNS_NOTIFY_NOSOA) == 0))) {
+	if (message != NULL && message->rcode == dns_rcode_formerr &&
+	    (notify->flags & DNS_NOTIFY_NOSOA) == 0) {
 		notify->flags |= DNS_NOTIFY_NOSOA;
 		dns_request_destroy(&notify->request);
 		result = notify_send_queue(notify);