From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Sat, 27 Jun 2015 18:17:11 +0000 (+0200)
Subject: modules/hints: fixed AAAA processing (swapped rclass/rtype)
X-Git-Tag: v1.0.0-beta1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6689fcc0783d421a93d24afe898af6faf03cc63;p=thirdparty%2Fknot-resolver.git

modules/hints: fixed AAAA processing (swapped rclass/rtype)
---

diff --git a/modules/hints/hints.c b/modules/hints/hints.c
index 5e5d4d7e1..c99d17016 100644
--- a/modules/hints/hints.c
+++ b/modules/hints/hints.c
@@ -70,14 +70,17 @@ static int answer_query(knot_pkt_t *pkt, pack_t *addr_set, struct kr_query *qry)
 		addr = pack_obj_next(addr);
 	}
 
-	/* Update packet question */
-	if (!knot_dname_is_equal(knot_pkt_qname(pkt), qname)) {
-		KR_PKT_RECYCLE(pkt);
-		knot_pkt_put_question(pkt, qname, rrtype, rrclass);
+	int ret = kr_error(ENOENT);
+	if (!knot_rrset_empty(&rr)) {
+		/* Update packet question */
+		if (!knot_dname_is_equal(knot_pkt_qname(pkt), qname)) {
+			KR_PKT_RECYCLE(pkt);
+			knot_pkt_put_question(pkt, qname, rrclass, rrtype);
+		}
+		/* Append to packet */
+		ret = knot_pkt_put(pkt, KNOT_COMPR_HINT_QNAME, &rr, KNOT_PF_FREE);
 	}
-
-	/* Append to packet */
-	int ret = knot_pkt_put(pkt, KNOT_COMPR_HINT_NONE, &rr, KNOT_PF_FREE);
+	/* Clear RR if failed */
 	if (ret != 0) {
 		knot_rrset_clear(&rr, &pkt->mm);
 	}