pullup:

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

diff --git a/CHANGES b/CHANGES
index 7bbba42aac7698b546d38593e6bd4ba6c2ddddd7..8548fffb93e062c08826695473e6792612b59c67 100644 (file)
--- 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 cf9c3b719c7d74f46aec701a8850155bd81fb2bf..96b6a96a2dee9005614c459dc67b787e2181d1cc 100644 (file)
--- 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