From: Aki Tuomi <cmouse@cmouse.fi>
Date: Sat, 7 Nov 2015 16:25:57 +0000 (+0200)
Subject: Print empty when DNSName is empty
X-Git-Tag: dnsdist-1.0.0-alpha1~239^2~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34dcd30c4dc1cee2247d268ff18f881756cb1923;p=pdns

Print empty when DNSName is empty
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 719fe1a30..d4a696776 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -847,7 +847,7 @@ inline vector<DNSName> SyncRes::shuffleInSpeedOrder(set<DNSName> &tnameservers,
           LOG(endl<<prefix<<"             ");
         }
       }
-      LOG(i->toString()<<"(" << (boost::format("%0.2f") % (speeds[*i]/1000.0)).str() <<"ms)");
+      LOG((i->empty() ? string("<empty>") : i->toString())<<"(" << (boost::format("%0.2f") % (speeds[*i]/1000.0)).str() <<"ms)");
     }
     LOG(endl);
   }
@@ -1181,7 +1181,7 @@ int SyncRes::doResolveAt(set<DNSName> nameservers, DNSName auth, bool flawedNSSe
       for(auto& rec : lwr.d_records) {
         if(rec.d_place==DNSResourceRecord::AUTHORITY && rec.d_type==QType::SOA &&
            lwr.d_rcode==RCode::NXDomain && qname.isPartOf(rec.d_name) && rec.d_name.isPartOf(auth)) {
-          LOG(prefix<<qname.toString()<<": got negative caching indication for name '"<<qname.toString()+"' (accept="<<rec.d_name.isPartOf(auth)<<"), newtarget='"<<newtarget.toString()<<"'"<<endl);
+          LOG(prefix<<qname.toString()<<": got negative caching indication for name '"<<qname.toString()+"' (accept="<<rec.d_name.isPartOf(auth)<<"), newtarget='"<<(newtarget.empty()?string("<empty>"):newtarget.toString())<<"'"<<endl);
 
           rec.d_ttl = min(rec.d_ttl, s_maxnegttl);
           if(newtarget.empty()) // only add a SOA if we're not going anywhere after this