From: Kees Monshouwer <mind04@monshouwer.org>
Date: Thu, 12 Jun 2014 19:27:10 +0000 (+0200)
Subject: pdnssec: replace getaddrinfo by inet_pton
X-Git-Tag: rec-3.6.0~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1472%2Fhead;p=thirdparty%2Fpdns.git

pdnssec: replace getaddrinfo by inet_pton
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index d3c7df5575..0e5e290a5a 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -401,20 +401,14 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       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)) {
+        struct in6_addr tmpbuf;
+        if (inet_pton(AF_INET6, rr.content.c_str(), &tmpbuf) != 1 || rr.content.find('.') != string::npos) {
           cout<<"[Warning] Following record is not a valid IPv6 address: "<<rr.qname<<" IN " <<rr.qtype.getName()<< " '" << rr.content<<"'"<<endl;
           numwarnings++;
-        } else
-          freeaddrinfo(res);
-        rr.content=tmp;
+        }
       }
     }
     catch(std::exception& e)