From 33d616c96c000a059c8a802509fb53bb142adb89 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Thu, 4 May 2017 17:05:09 +0200 Subject: [PATCH] auth: forget minimal... let's make this shiny ;) --- pdns/dnsbackend.cc | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc index 2454d6efb8..6f5e105ec8 100644 --- a/pdns/dnsbackend.cc +++ b/pdns/dnsbackend.cc @@ -265,23 +265,13 @@ bool DNSBackend::getSOA(const DNSName &domain, SOAData &sd, DNSPacket *p) bool DNSBackend::getBeforeAndAfterNames(uint32_t id, const DNSName& zonename, const DNSName& qname, DNSName& before, DNSName& after) { - // FIXME400 FIXME400 FIXME400 - // string lcqname=toLower(qname); FIXME400 tolower? - // string lczonename=toLower(zonename); FIXME400 tolower? - // lcqname=makeRelative(lcqname, lczonename); - DNSName lczonename = DNSName(toLower(zonename.toString())); - // lcqname=labelReverse(lcqname); - DNSName dnc; - string relqname, sbefore, safter; - relqname=labelReverse(makeRelative(toLower(qname.toStringNoDot()), zonename.toStringNoDot())); - //sbefore = before.toString(); - //safter = after.toString(); - bool ret = this->getBeforeAndAfterNamesAbsolute(id, relqname, dnc, sbefore, safter); - before = DNSName(labelReverse(sbefore)) + lczonename; - after = DNSName(labelReverse(safter)) + lczonename; - - // before=dotConcat(labelReverse(before), lczonename); FIXME400 - // after=dotConcat(labelReverse(after), lczonename); FIXME400 + DNSName unhashed; + string sbefore, safter; + string srelqname=qname.makeRelative(zonename).makeLowerCase().labelReverse().toString(" ", false); + + bool ret = this->getBeforeAndAfterNamesAbsolute(id, srelqname, unhashed, sbefore, safter); + before = (DNSName(labelReverse(sbefore)) + zonename).makeLowerCase(); + after = (DNSName(labelReverse(safter)) + zonename).makeLowerCase(); return ret; } -- 2.47.2