From ee2cce4d56d66f183ef48feb232e4fe37eb090cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Vavru=C5=A1a?= Date: Wed, 13 May 2015 12:04:58 +0200 Subject: [PATCH] lib/iterate: pair stype/m12n stype as well --- lib/layer/iterate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c index 963cb47a7..ca5eda5bc 100644 --- a/lib/layer/iterate.c +++ b/lib/layer/iterate.c @@ -50,7 +50,7 @@ static const knot_dname_t *minimized_qname(struct kr_query *query, uint16_t *qty { /* Minimization disabled. */ const knot_dname_t *qname = query->sname; - if (query->flags & (QUERY_NO_MINIMIZE|QUERY_CACHED)) { + if (query->flags & QUERY_NO_MINIMIZE) { return qname; } @@ -75,11 +75,11 @@ static bool is_paired_to_query(const knot_pkt_t *answer, struct kr_query *query) { uint16_t qtype = query->stype; const knot_dname_t *qname = minimized_qname(query, &qtype); - return query->id == knot_wire_get_id(answer->wire) && (query->sclass == KNOT_CLASS_ANY || query->sclass == knot_pkt_qclass(answer)) && - qtype == knot_pkt_qtype(answer) && - knot_dname_is_equal(qname, knot_pkt_qname(answer)); + (qtype == knot_pkt_qtype(answer) || query->stype == knot_pkt_qtype(answer)) && + (knot_dname_is_equal(qname, knot_pkt_qname(answer)) || + knot_dname_is_equal(query->sname, knot_pkt_qname(answer))); } /** Relaxed rule for AA, either AA=1 or SOA matching zone cut is required. */ -- 2.47.3