a function misnamed 'isCanonical' was being used to configure domain forwarding in...

diff --git a/pdns/misc.hh b/pdns/misc.hh
index 731c3df8cd1da473da9fd58aacaa3d5dec63c908..8d788dcdf4b428348e74c94ddf0b29eb637c688e 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -473,14 +473,6 @@ inline bool isCanonical(const string& qname)
   return qname[qname.size()-1]=='.';
 }
 
-inline bool isCanonical(const DNSName& qname)
-{
-  if(qname.empty())
-    return false;
-  return true;
-}
-
-
 inline DNSName toCanonic(const DNSName& zone, const string& qname)
 {
   if(qname.size()==1 && qname[0]=='@')

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 8993f9d33fb4f0459d2e840f7dcbb277ee23519b..ea0aadd08593083ef3f6b87ab1ad84eb306761a4 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -628,8 +628,9 @@ DNSName SyncRes::getBestNSNamesFromCache(const DNSName &qname, const QType& qtyp
     if( iter->second.d_servers.empty() )
       nsset.insert({DNSName(), {ComboAddress(), false}}); // this gets picked up in doResolveAt, the empty DNSName, combined with the empty ComboAddress means 'we are auth'
     else {
-      for(auto const &server : iter->second.d_servers)
+      for(auto const &server : iter->second.d_servers) {
         nsset.insert({DNSName(), {server, iter->second.d_rdForward}}); // An empty DNSName, combined with a non-empty ComboAddress means 'this is a forwarded domain'
+      }
     }
     return authdomain;
   }
@@ -965,7 +966,7 @@ int SyncRes::doResolveAt(map<DNSName, pair<ComboAddress, bool> > &nameservers, D
        if(g_luaconfs.getLocal()->dfe.getProcessingPolicy(*tns).d_kind != DNSFilterEngine::PolicyKind::NoAction)
          throw ImmediateServFailException("Dropped because of policy");
 
-        if(!isCanonical(*tns)) {
+        if(tns->empty()) {
           LOG(prefix<<qname.toString()<<": Domain has hardcoded nameserver(s)"<<endl);
 
           remoteIPs.push_back(nameservers[*tns].first);
@@ -1354,7 +1355,7 @@ int SyncRes::doResolveAt(map<DNSName, pair<ComboAddress, bool> > &nameservers, D
           nameservers.insert({nameserver, {ComboAddress(), false}});
         break;
       }
-      else if(isCanonical(*tns)) { // means: not OOB (I think)
+      else if(!tns->empty()) { // means: not OOB, OOB == empty
         goto wasLame;
       }
     }