fix the fetchresponse result for CNAME/DNAME

the fix in commit 1edbbc32b4 was incomplete; the wrong
event result could also be set in cache_name() and validated().

(cherry picked from commit 9ebeb60174f3074f96b7c00dcda852a5bd61bad6)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index d67945e90656aa9a9d412af39debb4fea2dfe1e4..4d3491c4a9e5b94d93851148e9f10b60b74b5482 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -6146,11 +6146,24 @@ answer_response:
                 * Negative results must be indicated in event->result.
                 */
                INSIST(hevent->rdataset != NULL);
-               if (dns_rdataset_isassociated(hevent->rdataset) &&
-                   NEGATIVE(hevent->rdataset))
-               {
-                       INSIST(eresult == DNS_R_NCACHENXDOMAIN ||
-                              eresult == DNS_R_NCACHENXRRSET);
+               if (dns_rdataset_isassociated(hevent->rdataset)) {
+                       if (NEGATIVE(hevent->rdataset)) {
+                               INSIST(eresult == DNS_R_NCACHENXDOMAIN ||
+                                      eresult == DNS_R_NCACHENXRRSET);
+                       } else if (eresult == ISC_R_SUCCESS &&
+                                  hevent->rdataset->type != fctx->type)
+                       {
+                               switch (hevent->rdataset->type) {
+                               case dns_rdatatype_cname:
+                                       eresult = DNS_R_CNAME;
+                                       break;
+                               case dns_rdatatype_dname:
+                                       eresult = DNS_R_DNAME;
+                                       break;
+                               default:
+                                       break;
+                               }
+                       }
                }
 
                hevent->result = eresult;
@@ -6799,11 +6812,25 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message,
                         * Negative results must be indicated in
                         * event->result.
                         */
-                       if (dns_rdataset_isassociated(event->rdataset) &&
-                           NEGATIVE(event->rdataset))
-                       {
-                               INSIST(eresult == DNS_R_NCACHENXDOMAIN ||
-                                      eresult == DNS_R_NCACHENXRRSET);
+                       if (dns_rdataset_isassociated(event->rdataset)) {
+                               if (NEGATIVE(event->rdataset)) {
+                                       INSIST(eresult ==
+                                                      DNS_R_NCACHENXDOMAIN ||
+                                              eresult == DNS_R_NCACHENXRRSET);
+                               } else if (eresult == ISC_R_SUCCESS &&
+                                          event->rdataset->type != fctx->type)
+                               {
+                                       switch (event->rdataset->type) {
+                                       case dns_rdatatype_cname:
+                                               eresult = DNS_R_CNAME;
+                                               break;
+                                       case dns_rdatatype_dname:
+                                               eresult = DNS_R_DNAME;
+                                               break;
+                                       default:
+                                               break;
+                                       }
+                               }
                        }
                        event->result = eresult;
                        if (adbp != NULL && *adbp != NULL) {