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

                        failed to receive a response. [RT #12322]

diff --git a/CHANGES b/CHANGES
index 2d80fd5fdc9aef83c6292c07d9218b63449baef9..c891fb3061ef7ee894d496eddf235796fbd84e34 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 1706.  [bug]           'rndc stop' failed to cause zones to be flushed
                        sometimes. [RT #12328]
 
+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 9c84f5b25c6f5e1bfb6b9e8351f130935e53759c..b5cbc6e798ea0aae43e5a033bec7db6ea9d55f84 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.333.2.23.2.49 2004/08/27 12:25:47 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.23.2.50 2004/08/28 05:53:37 marka Exp $ */
 
 #include <config.h>
 
@@ -5176,9 +5176,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);