From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 14 Sep 2017 09:31:26 +0000 (+0200)
Subject: explicitly warn when no hostname can be gathered
X-Git-Tag: rec-4.1.0-rc1~42^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5689%2Fhead;p=thirdparty%2Fpdns.git

explicitly warn when no hostname can be gathered
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index c3213712d7..b7b48ce53f 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -593,8 +593,10 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
         toCheck = DNSName(rr.content);
       }
 
-      if (!toCheck.empty() && !toCheck.isHostname()) {
-        cout<<"[Warning] "<<rr.qtype.getName()<<" record in zone '"<<zone<<"' has non-hostname content '"<<toCheck<<"'."<<endl;
+      if (toCheck.empty())
+        cout<<"[Warning] "<<rr.qtype.getName()<<" record in zone '"<<zone<<"': unable to extract hostname from content."<<endl;
+      else if(!toCheck.isHostname()) {
+        cout<<"[Warning] "<<rr.qtype.getName()<<" record in zone '"<<zone<<"' has non-hostname content '"<<toCheck.toString()<<"'."<<endl;
         numwarnings++;
       }
     }