1703. [bug] named would loop sending NOTIFY messages when it

                        failed to receive a response. [RT #12322]

diff --git a/CHANGES b/CHANGES
index 9bec73dc323cb6ebe0840d880914e88829ac949c..20bc724442d00b9e459af89f606a291245bbc3f8 100644 (file)
--- 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 e729aff7062f6ee28ab551932494ab209f81cddd..155fc71c798e7f68aeea58c6876751582a57498b 100644 (file)
--- 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);