From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 28 Jun 2016 15:28:36 +0000 (+0200)
Subject: Merge branch 'pipe-getauth' of https://github.com/rgacogne/pdns into rgacogne-pipe... 
X-Git-Tag: auth-4.0.0-rc1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73c4de35e8a8b1c17b2665ab2bc30e2a6a885bb8;p=thirdparty%2Fpdns.git

Merge branch 'pipe-getauth' of https://github.com/rgacogne/pdns into rgacogne-pipe-getauth
---

73c4de35e8a8b1c17b2665ab2bc30e2a6a885bb8
diff --cc pdns/ueberbackend.cc
index c576f5252c,ed122c2187..25fbeb8280
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@@ -293,12 -299,11 +299,12 @@@ bool UeberBackend::getAuth(DNSPacket *p
            *sd = j->second;
            break;
          } else {
-           DLOG(L<<Logger::Error<<"lookup: "<<shorter<<endl);
-           if((*i)->getAuth(p, sd, shorter)) {
+           DLOG(L<<Logger::Error<<"lookup: "<<choppedOff<<endl);
+           if((*i)->getAuth(p, sd, choppedOff)) {
              DLOG(L<<Logger::Error<<"got: "<<sd->qname<<endl);
              j->first = sd->qname.wirelength();
 +            j->second = *sd;
-             if(sd->qname == shorter) {
+             if(sd->qname == choppedOff) {
                break;
              }
            } else {