From edb255f9bf25ba56e245d561afe4b2a7b1d646ef Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 1 Oct 2013 00:04:57 +0200
Subject: [PATCH] pdnssec check-zone, more tolerant IPv6 format check

---
 pdns/pdnssec.cc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index e8c0cae5436b..64719d4bdddc 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -375,10 +375,23 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(rr.qtype.getCode(), 1, rr.content));
       string tmp=drc->serialize(rr.qname);
       tmp = drc->getZoneRepresentation();
-      if (!pdns_iequals(tmp, rr.content)) {
-        cout<<"[Warning] Parsed and original record content are not equal: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"' (Content parsed as '"<<tmp<<"')"<<endl;
+      if (rr.qtype.getCode() != QType::AAAA) {
+        if (!pdns_iequals(tmp, rr.content)) {
+          cout<<"[Warning] Parsed and original record content are not equal: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"' (Content parsed as '"<<tmp<<"')"<<endl;
+          rr.content=tmp;
+          numwarnings++;
+        }
+      } else {
+        struct addrinfo hint, *res;
+        memset(&hint, 0, sizeof(hint));
+        hint.ai_family = AF_INET6;
+        hint.ai_flags = AI_NUMERICHOST;
+        if(getaddrinfo(rr.content.c_str(), 0, &hint, &res)) {
+          cout<<"[Warning] Folowing record is not a vallid IPv6 address: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"'"<<endl;
+          numwarnings++;
+        } else
+          freeaddrinfo(res);
         rr.content=tmp;
-        numwarnings++;
       }
     }
     catch(std::exception& e)