Reduce diff with branch

diff --git a/builder b/builder
index 5a2b95886f5458df3dbc2f125b9a6a4946750885..c66dee9bfa5a676ebd8543c7c111a93242043db6 160000 (submodule)
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit 5a2b95886f5458df3dbc2f125b9a6a4946750885
+Subproject commit c66dee9bfa5a676ebd8543c7c111a93242043db6

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 041054160b07941cda6a20bd9792282ef23a086e..329ae8b24c415b2ce223f19d629f4f95b83edee5 100644 (file)
--- 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<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl)
+int directResolve(const DNSName& qname, const QType qtype, int qclass, vector<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl)
 {
   return directResolve(qname, qtype, qclass, ret, pdl, SyncRes::s_qnameminimization);
 }
 
-int directResolve(const DNSName& qname, const QType qtype, const uint16_t qclass, vector<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl, bool qm)
+int directResolve(const DNSName& qname, const QType qtype, int qclass, vector<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl, bool qm)
 {
   struct timeval now;
   gettimeofday(&now, 0);

diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index 2418c40f633b7dd4f7b83e78f4a8b0cd9f537444..a0e57001da3afeb8823dbcedbfe0726579176c0b 100644 (file)
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -1130,8 +1130,8 @@ typedef boost::function<void*(void)> 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<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl);
-int directResolve(const DNSName& qname, const QType qtype, const uint16_t qclass, vector<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl, bool qm);
+int directResolve(const DNSName& qname, const QType qtype, int qclass, vector<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl);
+int directResolve(const DNSName& qname, const QType qtype, int qclass, vector<DNSRecord>& ret, shared_ptr<RecursorLua4> pdl, bool qm);
 int followCNAMERecords(std::vector<DNSRecord>& ret, const QType qtype, int oldret);
 int getFakeAAAARecords(const DNSName& qname, ComboAddress prefix, vector<DNSRecord>& ret);
 int getFakePTRRecords(const DNSName& qname, vector<DNSRecord>& ret);