From: Andreas Gustafsson <source@isc.org>
Date: Fri, 28 Jul 2000 00:13:40 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.0.0rc2~43
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=99b3a7a8e702de62aa0a222dc39b9db024e17116;p=thirdparty%2Fbind9.git

pullup:
Removed some cruft and a crash.
---

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index c65f8eca8dc..dc3410b43f1 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.72.2.4 2000/07/28 00:00:18 gson Exp $
+ * $Id: tsig.c,v 1.72.2.5 2000/07/28 00:13:40 gson Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -141,18 +141,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 
 		if (ring != NULL) {
 			RWLOCK(&ring->lock, isc_rwlocktype_write);
-			ret = dns_rbt_findname(ring->keys, name, 0, NULL,
-					       (void *)&tmp);
-			if (ret == ISC_R_SUCCESS) {
-				ret = ISC_R_EXISTS;
-				RWUNLOCK(&ring->lock, isc_rwlocktype_write);
-				goto cleanup_algorithm;
-			}
-			INSIST(ret == ISC_R_NOTFOUND ||
-			       ret == DNS_R_PARTIALMATCH);
 			ret = dns_rbt_addname(ring->keys, name, tkey);
 			if (ret != ISC_R_SUCCESS) {
-				ret = ISC_R_EXISTS;
 				RWUNLOCK(&ring->lock, isc_rwlocktype_write);
 				goto cleanup_algorithm;
 			}
@@ -187,7 +177,7 @@ cleanup_algorithm:
 cleanup_name:
 	dns_name_free(&tkey->name, mctx);
 cleanup_key:
-	isc_mem_put(mctx, *key, sizeof(dns_tsigkey_t));
+	isc_mem_put(mctx, tkey, sizeof(dns_tsigkey_t));
 
 	return (ret);
 }