pullup:

1238.   [bug]           It is possible to lockup the server when shutting down
                        if notifies are being processed. [RT #2591]

diff --git a/CHANGES b/CHANGES
index 8a6035b1e974c0cf1cb98c1f4bf3fd8de5ce6222..7f96b88291936379f991e1de8e33c5eb1928a647 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
                        use a name after it had been freed triggering
                        INSIST() failures.  [RT #2614]
 
+1238.  [bug]           It is possible to lockup the server when shutting down
+                       if notifies are being processed. [RT #2591]
+
        --- 9.2.1rc2 released ---
 
 1237.  [bug]           nslookup: "set q=type" failed.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c8afba042103fb360d5d67d4fe2657edd0af398f..2581261bf9bb4760e343f49e8ed400db426600ab 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.333.2.7 2002/02/08 03:57:31 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.8 2002/03/29 00:20:07 marka Exp $ */
 
 #include <config.h>
 
@@ -4563,7 +4563,9 @@ notify_done(isc_task_t *task, isc_event_t *event) {
                notify->flags |= DNS_NOTIFY_NOSOA;
                notify->attempt++;
                dns_request_destroy(&notify->request);
-               notify_send_queue(notify);
+               result = notify_send_queue(notify);
+               if (result != ISC_R_SUCCESS)
+                       notify_destroy(notify, ISC_FALSE);
        } else {
                if (result == ISC_R_TIMEDOUT)
                        notify_log(notify->zone, ISC_LOG_DEBUG(1),