From 7e2c0c16d6e03058650f536a5b43cb21598ec91f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 28 May 2004 23:53:46 +0000
Subject: [PATCH] 1645.   [bug]           named could trigger a REQUIRE failure
 if multiple                         masters with keys are specified.

---
 CHANGES        | 3 +++
 lib/dns/zone.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a6fbf19085..a2506ef8c8 100644
--- 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 6922e9d596..7ae7e7713c 100644
--- 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;