From decc573db598d941a562aca33fa58b9f03df6406 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 22 Feb 2018 11:14:16 +0100
Subject: [PATCH] make check-zone error on records that have content but
 shouldn't.

Fixes #6064
---
 pdns/pdnsutil.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index f4e37ab62..f8d93fe3e 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -299,8 +299,13 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
     records=*suppliedrecords;
 
   for(auto rr : records) { // we modify this
-    if(!rr.qtype.getCode())
+    if(!rr.qtype.getCode()) {
+      if(rr.content.length()) {
+        cout<<"[Error] ENT (or unknown type) has content: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"'"<<endl;
+        numerrors++;
+      }
       continue;
+    }
 
     numrecords++;
 
-- 
2.40.0