pullup:

825.   [bug]           zone.c:ns_query() detached from the wrong zone
                        reference.  [RT #1263]

diff --git a/CHANGES b/CHANGES
index ec8a90885428e690f824689dc6b67230bdcbfe5b..f235c738bfb40877eb89f547f4fed240964c5d52 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 825.  [bug]           zone.c:ns_query() detached from the wrong zone
+                       reference.  [RT #1263] 
+
  822.  [bug]           Sending nxrrset prerequisites would crash nsupdate.
                        [RT #1248]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 25a3545050ea2062fee1a377950f738ccea286ae..d9bb002f687a8b3bcae67870467b1c7788c4ffe0 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.283.2.9 2001/03/01 20:58:17 bwelling Exp $ */
+/* $Id: zone.c,v 1.283.2.10 2001/05/10 21:52:01 gson Exp $ */
 
 #include <config.h>
 
@@ -3562,8 +3562,9 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
                                            ISC_FALSE);
                if (stub->db != NULL)
                        dns_db_detach(&stub->db);
+               if (stub->zone != NULL)
+                       zone_idetach(&stub->zone);
                isc_mem_put(stub->mctx, stub, sizeof(*stub));
-               zone_idetach(&zone);
        }
        if (message != NULL)
                dns_message_destroy(&message);