From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Thu, 2 Feb 2017 13:36:35 +0000 (+0100)
Subject: lib/resolve: fix zonecut fetching for explicit DS queries
X-Git-Tag: v1.3.0~23^2~91^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb52c834457fc2d5245e0b9ed86478ca2e772da9;p=thirdparty%2Fknot-resolver.git

lib/resolve: fix zonecut fetching for explicit DS queries
---

diff --git a/lib/resolve.c b/lib/resolve.c
index 8b391d757..5666758c7 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -917,6 +917,9 @@ static int zone_cut_check(struct kr_request *request, struct kr_query *qry, knot
 		if (parent[0] != '\0' && knot_dname_in(parent, qry->sname)) {
 			requested_name = knot_wire_next_label(parent, NULL);
 		}
+	} else if ((qry->stype == KNOT_RRTYPE_DS) && (qry->sname[0] != '\0')) {
+		/* If this is explicit DS query, start from encloser too. */
+		requested_name = knot_wire_next_label(requested_name, NULL);
 	}
 
 	int state = KR_STATE_FAIL;