From: Kees Monshouwer <mind04@monshouwer.org>
Date: Thu, 4 May 2017 15:05:09 +0000 (+0200)
Subject: auth: forget minimal... let's make this shiny ;)
X-Git-Tag: auth-4.0.4-rc1~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d616c96c000a059c8a802509fb53bb142adb89;p=thirdparty%2Fpdns.git

auth: forget minimal... let's make this shiny ;)
---

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;
 }