From: Mark Andrews <marka@isc.org>
Date: Tue, 18 May 2010 06:24:27 +0000 (+0000)
Subject: wrong rdataset disassociated. reviewed by each
X-Git-Tag: v9.7.1b1^3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=facf31bace1a60d585529b31b2669ededbb16662;p=thirdparty%2Fbind9.git

wrong rdataset disassociated. reviewed by each
---

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 41e2fd044c3..b70ea5bc3b2 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.173.66.3 2010/03/12 03:37:20 marka Exp $ */
+/* $Id: nsupdate.c,v 1.173.66.4 2010/05/18 06:24:27 marka Exp $ */
 
 /*! \file */
 
@@ -2698,7 +2698,7 @@ start_update(void) {
 		dns_name_init(name, NULL);
 		dns_name_clone(userzone, name);
 	} else {
-		dns_rdataset_t *rdataset;
+		dns_rdataset_t *tmprdataset;
 		result = dns_message_firstname(updatemsg, section);
 		if (result == ISC_R_NOMORE) {
 			section = DNS_SECTION_PREREQUISITE;
@@ -2722,10 +2722,10 @@ start_update(void) {
 		 * records live in the parent zone so we need to start our
 		 * search one label up.
 		 */
-		rdataset = ISC_LIST_HEAD(firstname->list);
+		tmprdataset = ISC_LIST_HEAD(firstname->list);
 		if (section == DNS_SECTION_UPDATE &&
 		    !dns_name_equal(firstname, dns_rootname) &&
-		    rdataset->type == dns_rdatatype_ds) {
+		    tmprdataset->type == dns_rdatatype_ds) {
 		    unsigned int labels = dns_name_countlabels(name);
 		    dns_name_getlabelsequence(name, 1, labels - 1, name);
 		}