close issue where asking for a AAAA for a record with a CNAME only to an A record...

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1542 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 7543894c2cb694225c540ff2857460d59a07e014..84b623e37ff950cc3e0c00f3a5bcd59af4b45ccb 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -393,7 +393,7 @@ int PacketHandler::makeCanonic(DNSPacket *p, DNSPacket *r, string &target)
         r->addRecord(rr);
       }
     }
-    if(hits && !relevantNS && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+    if(!numloops && hits && !relevantNS && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
       DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
     }

diff --git a/regression-tests/cname-but-no-correct-type/expected_result b/regression-tests/cname-but-no-correct-type/expected_result
index 40d4393b4fc0ab4cfd1a3345b4a7edff39557dcf..85596ccece2c1bbc21daabe54dc549731d221bc9 100644 (file)
--- a/regression-tests/cname-but-no-correct-type/expected_result
+++ b/regression-tests/cname-but-no-correct-type/expected_result
@@ -1,4 +1,4 @@
-Reply to question for qname='www.example.com.', qtype=AAAA
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 0      www.example.com.        IN      CNAME   120     outpost.example.com.
 1      example.com.    IN      SOA     120     ns1.example.com. ahu.example.com. 2000081501 28800 7200 604800 86400
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='www.example.com.', qtype=AAAA