2869. [bug] Fix arguments to dns_keytable_findnextkeynode() call.

                        [RT #20877]

diff --git a/CHANGES b/CHANGES
index b05e5a25040cd3ac71dd467a609969ac6e6793a5..07fe9a806bb3125ecb2e6e2a918db3fc1aed2bfe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,9 @@
 2890.  [bug]           Handle the introduction of new trusted-keys and
                        DS, DLV RRsets better. [RT #21097]
 
+2869.  [bug]           Fix arguments to dns_keytable_findnextkeynode() call.
+                       [RT #20877]
+
 2678.  [func]          Treat DS queries as if "minimal-response yes;"
                        was set. [RT #20258]
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 37e7a0c64c2ea73a5b3b6eb54bda69448ebd7e45..6a1d0c9a04b44fb7678326fcc52c6c6fa4e4471f 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.119.18.58 2010/06/26 00:11:50 marka Exp $ */
+/* $Id: validator.c,v 1.119.18.59 2010/09/02 07:21:53 marka Exp $ */
 
 /*! \file */
 
@@ -1819,7 +1819,7 @@ validatezonekey(dns_validator_t *val) {
                     result == ISC_R_SUCCESS;
                     result = dns_rdataset_next(val->event->sigrdataset))
                {
-                       dns_keynode_t *keynode = NULL, *nextnode = NULL;
+                       dns_keynode_t *keynode = NULL;
                        dns_fixedname_t fixed;
                        dns_name_t *found;
 
@@ -1860,6 +1860,7 @@ validatezonekey(dns_validator_t *val) {
                            result == ISC_R_SUCCESS)
                                atsep = ISC_TRUE;
                        while (result == ISC_R_SUCCESS) {
+                               dns_keynode_t *nextnode = NULL;
                                dstkey = dns_keynode_key(keynode);
                                result = verify(val, dstkey, &sigrdata,
                                                sig.keyid);