remove unused assignments [RT #45147]

(cherry picked from commit 78551a3f2c9dd53a85386a6234860127e23befd9)

diff --git a/bin/named/query.c b/bin/named/query.c
index ed771cb79320b70b7c661fb440387076995242c2..8f2d23a626a31668c6a65cf0fffa075dcb058fcf 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1548,12 +1548,14 @@ query_addadditional(void *arg, 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;
@@ -1617,12 +1619,14 @@ query_addadditional(void *arg, 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;