From: Andreas Gustafsson <source@isc.org>
Date: Mon, 25 Sep 2000 20:20:26 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.0.0^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7443ae33b1f82f4b59fe5d827c3df174918876;p=thirdparty%2Fbind9.git

pullup:
 488.   [bug]           Locks weren't properly destroyed in some cases.
---

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 1ef9808e9d3..b15bfd606bb 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.72.2.8 2000/08/01 15:06:22 gson Exp $
+ * $Id: tsig.c,v 1.72.2.9 2000/09/25 20:20:25 gson Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -209,6 +209,7 @@ tsigkey_free(dns_tsigkey_t *key) {
 		dns_name_free(key->creator, key->mctx);
 		isc_mem_put(key->mctx, key->creator, sizeof(dns_name_t));
 	}
+	DESTROYLOCK(&key->lock);
 	isc_mem_put(key->mctx, key, sizeof(dns_tsigkey_t));
 }
 
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 2b09756fc9a..15f69e3101a 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: view.c,v 1.71 2000/06/22 21:54:56 tale Exp $ */
+/* $Id: view.c,v 1.71.2.1 2000/09/25 20:20:26 gson Exp $ */
 
 #include <config.h>
 
@@ -231,6 +231,7 @@ destroy(dns_view_t *view) {
 		dns_acl_detach(&view->recursionacl);
 	dns_keytable_detach(&view->trustedkeys);
 	dns_keytable_detach(&view->secroots);
+	isc_rwlock_destroy(&view->conflock);
 	isc_mutex_destroy(&view->lock);
 	isc_mem_free(view->mctx, view->name);
 	isc_mem_put(view->mctx, view, sizeof *view);