From 872912d6ac97d15dc6fe12ef94b17ff6c4b9fce1 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sun, 4 Jun 2017 13:27:07 +0200
Subject: [PATCH] auth: make sure upcase qnames do not confuse rectify or axfr

---
 pdns/lua-auth.cc    | 1 +
 pdns/pdnsutil.cc    | 1 +
 pdns/tcpreceiver.cc | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pdns/lua-auth.cc b/pdns/lua-auth.cc
index 18dfd7a30..40f09656d 100644
--- a/pdns/lua-auth.cc
+++ b/pdns/lua-auth.cc
@@ -149,6 +149,7 @@ bool AuthLua::axfrfilter(const ComboAddress& remote, const DNSName& zone, const
     lua_pop(d_lua, 1); // table
 
     //    cerr<<"Adding content '"<<rr.content<<"' with place "<<(int)rr.d_place<<" \n";
+    rr.qname.makeUsLowerCase();
     out.push_back(rr);
   }
   lua_pop(d_lua, 2); // c
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index fe7a4d0c7..50e30fe10 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -165,6 +165,7 @@ bool rectifyZone(DNSSECKeeper& dk, const DNSName& zone)
   vector<DNSResourceRecord> rrs;
 
   while(sd.db->get(rr)) {
+    rr.qname.makeUsLowerCase();
     if (rr.qtype.getCode())
     {
       rrs.push_back(rr);
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 837aa86cd..34339835f 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -751,6 +751,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr<DNSPacket> q, int ou
     rrs.push_back(rr);
 
   while(sd.db->get(rr)) {
+    rr.qname.makeUsLowerCase();
     if(rr.qname.isPartOf(target)) {
       if (rr.qtype.getCode() == QType::ALIAS && ::arg().mustDo("outgoing-axfr-expand-alias")) {
         vector<DNSResourceRecord> ips;
-- 
2.40.0