From: Mark Andrews <marka@isc.org>
Date: Tue, 2 May 2017 21:45:18 +0000 (+1000)
Subject: remove unused assignments [RT #45147]
X-Git-Tag: v9.12.0a1~316
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=78551a3f2c9dd53a85386a6234860127e23befd9;p=thirdparty%2Fbind9.git

remove unused assignments [RT #45147]
---

diff --git a/bin/named/query.c b/bin/named/query.c
index 1c63f2ce0b2..b3360d2abb8 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1864,12 +1864,14 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
 				if (sigrdataset != NULL &&
 				    dns_rdataset_isassociated(sigrdataset))
 					dns_rdataset_disassociate(sigrdataset);
-				result = ISC_R_NOTFOUND;
+				/* treat as if not found */
 			} else if (!query_isduplicate(client, fname,
-					       dns_rdatatype_a, &mname)) {
+					       dns_rdatatype_a, &mname))
+			{
 				if (mname != fname) {
 					if (mname != NULL) {
-						query_releasename(client, &fname);
+						query_releasename(client,
+								  &fname);
 						fname = mname;
 					} else
 						need_addname = ISC_TRUE;
@@ -1932,12 +1934,14 @@ query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
 				if (sigrdataset != NULL &&
 				    dns_rdataset_isassociated(sigrdataset))
 					dns_rdataset_disassociate(sigrdataset);
-				result = ISC_R_NOTFOUND;
+				/* treat as if not found */
 			} else if (!query_isduplicate(client, fname,
-					       dns_rdatatype_aaaa, &mname)) {
+					       dns_rdatatype_aaaa, &mname))
+			{
 				if (mname != fname) {
 					if (mname != NULL) {
-						query_releasename(client, &fname);
+						query_releasename(client,
+								  &fname);
 						fname = mname;
 					} else
 						need_addname = ISC_TRUE;