From c9bd4ece66eb6d1d2805e8e2da080d85314fd1d9 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 8 Aug 2018 15:24:36 +0200
Subject: [PATCH] check-zone: allow null MX, SRV; fixes #6800

---
 pdns/pdnsutil.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index a8ae1c18f1..2a1dc2f651 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -449,7 +449,9 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
 
       if (toCheck.empty())
         cout<<"[Warning] "<<rr.qtype.getName()<<" record in zone '"<<zone<<"': unable to extract hostname from content."<<endl;
-      else if(!toCheck.isHostname()) {
+      else if ((rr.qtype.getCode() == QType::MX || rr.qtype.getCode() == QType::SRV) && toCheck == g_rootdnsname) {
+        // allow null MX/SRV
+      } else if(!toCheck.isHostname()) {
         cout<<"[Warning] "<<rr.qtype.getName()<<" record in zone '"<<zone<<"' has non-hostname content '"<<toCheck.toString()<<"'."<<endl;
         numwarnings++;
       }
-- 
2.47.2