From: Mark Andrews <marka@isc.org>
Date: Thu, 2 Sep 2010 07:21:53 +0000 (+0000)
Subject: 2869.   [bug]           Fix arguments to dns_keytable_findnextkeynode() call.
X-Git-Tag: v9.4-ESV-R3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a1ec8d9fe18923aba3800827292f94c55f4603;p=thirdparty%2Fbind9.git

2869.   [bug]           Fix arguments to dns_keytable_findnextkeynode() call.
                        [RT #20877]
---

diff --git a/CHANGES b/CHANGES
index b05e5a25040..07fe9a806bb 100644
--- 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 37e7a0c64c2..6a1d0c9a04b 100644
--- 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);