From 54231cf0821bd45ce3f525631cc44f96e00996f4 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 20 May 2015 00:10:38 -0700 Subject: [PATCH] [master] minor cleanup --- bin/named/query.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/bin/named/query.c b/bin/named/query.c index 506c0b1430..2a11434dc2 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -6485,6 +6485,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) is_zone = ISC_FALSE; is_staticstub_zone = ISC_FALSE; + if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) + type = dns_rdatatype_any; + dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); @@ -6570,11 +6573,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) sigrdataset = event->sigrdataset; } - if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) - type = dns_rdatatype_any; - else - type = qtype; - if (DNS64(client)) { client->query.attributes &= ~NS_QUERYATTR_DNS64; dns64 = ISC_TRUE; @@ -6671,14 +6669,6 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) } } - /* - * If it's a SIG query, we'll iterate the node. - */ - if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig) - type = dns_rdatatype_any; - else - type = qtype; - restart: CTRACE(ISC_LOG_DEBUG(3), "query_find: restart"); want_restart = ISC_FALSE;