From 8758d36a5e0461fb3aee8f0dc5b35ddca98e00af Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 21 Feb 2019 18:24:30 +1100 Subject: [PATCH 1/2] use client->query.qname --- lib/ns/query.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ns/query.c b/lib/ns/query.c index b6c20fb1853..f1c640b43f1 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -4672,6 +4672,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_dbversion_t *version = NULL; dns_zone_t *zone = NULL; bool is_zone; + unsigned int labels; unsigned int options; CTRACE(ISC_LOG_DEBUG(3), "redirect2"); @@ -4714,12 +4715,13 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, } redirectname = dns_fixedname_initname(&fixedredirect); - if (dns_name_countlabels(name) > 1U) { + labels = dns_name_countlabels(client->query.qname); + if (labels > 1U) { dns_name_t prefix; - unsigned int labels = dns_name_countlabels(name) - 1; dns_name_init(&prefix, NULL); - dns_name_getlabelsequence(name, 0, labels, &prefix); + dns_name_getlabelsequence(client->query.qname, 0, labels - 1, + &prefix); result = dns_name_concatenate(&prefix, client->view->redirectzone, redirectname, NULL); -- GitLab From ad785e4f93b8c3afe082e40eb25f9c88f93611b5 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 22 Feb 2019 16:25:34 +1100 Subject: [PATCH 2/2] add CHANGES --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index faa9394d06b..3f45d925580 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5167. [bug] nxdomain-redirect could sometimes lookup the wrong + redirect name. [GL #892] + 5166. [placeholder] 5165. [contrib] Removed SDB drivers from contrib; they're obsolete. -- GitLab