From 93ee793d97df97b8d38229542e8a74f49186bd80 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 21 Feb 2019 18:24:30 +1100 Subject: [PATCH] use client->query.qname (cherry picked from commit 8758d36a5e0461fb3aee8f0dc5b35ddca98e00af) --- bin/named/query.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/named/query.c b/bin/named/query.c index 1d3edbcc6f..f85cc764ac 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -6568,6 +6568,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"); @@ -6610,12 +6611,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);