1645. [bug] named could trigger a REQUIRE failure if multiple

                        masters with keys are specified.

diff --git a/CHANGES b/CHANGES
index a6fbf19085b200f8d6858ecb6c8d713b02e2b967..a2506ef8c8a125909b5dadaf8847a34c499a2530 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1645.  [bug]           named could trigger a REQUIRE failure if multiple
+                       masters with keys are specified.
+
 1644.  [placeholder]   rt11436
 
 1643.  [bug]           dns_db_closeversion() could leak memory / node

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 6922e9d596ebf32b38b288469a80ef7c84d3c8dc..7ae7e7713c7a8d17b04fa8352b31600ea35f3270 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.414 2004/04/29 01:44:44 marka Exp $ */
+/* $Id: zone.c,v 1.415 2004/05/28 23:53:46 marka Exp $ */
 
 #include <config.h>
 
@@ -3990,6 +3990,8 @@ soa_query(isc_task_t *task, isc_event_t *event) {
        return;
 
  skip_master:
+       if (key != NULL)
+               dns_tsigkey_detach(&key);
        zone->curmaster++;
        if (zone->curmaster < zone->masterscnt)
                goto again;