From: Andreas Gustafsson <source@isc.org>
Date: Fri, 8 Jun 2001 19:44:06 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.1.3rc2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64c07684c6694565106eb9d701c3f34d01db1e47;p=thirdparty%2Fbind9.git

pullup:
 888.   [bug]           Don't die when using TKEY to delete a nonexistent
                        TSIG key. [RT #1392]
---

diff --git a/CHANGES b/CHANGES
index 7bbba42aac7..8548fffb93e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@
 			do the verification, but it's not currently
 			possible. [RT #1391]
 
+ 888.	[bug]		Don't die when using TKEY to delete a nonexistent
+			TSIG key. [RT #1392]
+
  860.	[func]		Drop cross class glue in zone transfers.
 
  852.	[bug]		Handle responses from servers which do not
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index cf9c3b719c7..96b6a96a2de 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.57.2.5 2001/01/30 22:12:22 gson Exp $
+ * $Id: tkey.c,v 1.57.2.6 2001/06/08 19:44:06 gson Exp $
  */
 
 #include <config.h>
@@ -520,12 +520,13 @@ process_deletetkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name,
 	dns_name_t *identity;
 
 	UNUSED(msg);
-	UNUSED(tkeyout);
 	UNUSED(namelist);
 
 	result = dns_tsigkey_find(&tsigkey, name, &tkeyin->algorithm, ring);
-	if (result != ISC_R_SUCCESS)
+	if (result != ISC_R_SUCCESS) {
 		tkeyout->error = dns_tsigerror_badname;
+		return (ISC_R_SUCCESS);
+	}
 
 	/*
 	 * Only allow a delete if the identity that created the key is the