From 2d894d7e5c47081a23c9e9496204f64a81103f9a Mon Sep 17 00:00:00 2001 From: Otto Date: Wed, 6 Oct 2021 11:13:17 +0200 Subject: [PATCH] Reduce diff with branch --- builder | 2 +- pdns/syncres.cc | 4 ++-- pdns/syncres.hh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builder b/builder index 5a2b95886f..c66dee9bfa 160000 --- a/builder +++ b/builder @@ -1 +1 @@ -Subproject commit 5a2b95886f5458df3dbc2f125b9a6a4946750885 +Subproject commit c66dee9bfa5a676ebd8543c7c111a93242043db6 diff --git a/pdns/syncres.cc b/pdns/syncres.cc index 041054160b..329ae8b24c 100644 --- a/pdns/syncres.cc +++ b/pdns/syncres.cc @@ -4525,12 +4525,12 @@ void SyncRes::parseEDNSSubnetAddFor(const std::string& subnetlist) } // used by PowerDNSLua - note that this neglects to add the packet count & statistics back to pdns_recursor.cc -int directResolve(const DNSName& qname, const QType qtype, const uint16_t qclass, vector& ret, shared_ptr pdl) +int directResolve(const DNSName& qname, const QType qtype, int qclass, vector& ret, shared_ptr pdl) { return directResolve(qname, qtype, qclass, ret, pdl, SyncRes::s_qnameminimization); } -int directResolve(const DNSName& qname, const QType qtype, const uint16_t qclass, vector& ret, shared_ptr pdl, bool qm) +int directResolve(const DNSName& qname, const QType qtype, int qclass, vector& ret, shared_ptr pdl, bool qm) { struct timeval now; gettimeofday(&now, 0); diff --git a/pdns/syncres.hh b/pdns/syncres.hh index 2418c40f63..a0e57001da 100644 --- a/pdns/syncres.hh +++ b/pdns/syncres.hh @@ -1130,8 +1130,8 @@ typedef boost::function pipefunc_t; void broadcastFunction(const pipefunc_t& func); void distributeAsyncFunction(const std::string& question, const pipefunc_t& func); -int directResolve(const DNSName& qname, const QType qtype, const uint16_t qclass, vector& ret, shared_ptr pdl); -int directResolve(const DNSName& qname, const QType qtype, const uint16_t qclass, vector& ret, shared_ptr pdl, bool qm); +int directResolve(const DNSName& qname, const QType qtype, int qclass, vector& ret, shared_ptr pdl); +int directResolve(const DNSName& qname, const QType qtype, int qclass, vector& ret, shared_ptr pdl, bool qm); int followCNAMERecords(std::vector& ret, const QType qtype, int oldret); int getFakeAAAARecords(const DNSName& qname, ComboAddress prefix, vector& ret); int getFakePTRRecords(const DNSName& qname, vector& ret); -- 2.47.2