From: Christian Hofstaedtler Date: Tue, 27 Jan 2015 00:10:17 +0000 (+0100) Subject: Remove zoneId from getAuth() X-Git-Tag: dnsdist-1.0.0-alpha1~306^2~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81c486adf5e09aac5f2886f8566d3a4eb36606dc;p=thirdparty%2Fpdns.git Remove zoneId from getAuth() Nobody cared about it. --- diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc index 15123c2e0d..90c6d1d49d 100644 --- a/pdns/dnsbackend.cc +++ b/pdns/dnsbackend.cc @@ -30,7 +30,7 @@ #include "dnspacket.hh" #include "dns.hh" -bool DNSBackend::getAuth(DNSPacket *p, SOAData *sd, const string &target, int *zoneId, const int best_match_len) +bool DNSBackend::getAuth(DNSPacket *p, SOAData *sd, const string &target, const int best_match_len) { bool found=false; string subdomain(target); @@ -40,8 +40,6 @@ bool DNSBackend::getAuth(DNSPacket *p, SOAData *sd, const string &target, int *z if( this->getSOA( subdomain, *sd, p ) ) { sd->qname = subdomain; - if(zoneId) - *zoneId = sd->domain_id; if(p->qtype.getCode() == QType::DS && pdns_iequals(subdomain, target)) { // Found authoritative zone but look for parent zone with 'DS' record. @@ -364,7 +362,7 @@ bool _add_to_negcache( const string &zone ) { return false; } -inline int DNSReversedBackend::_getAuth(DNSPacket *p, SOAData *soa, const string &inZone, int *zoneId, const string &querykey, const int best_match_len) { +inline int DNSReversedBackend::_getAuth(DNSPacket *p, SOAData *soa, const string &inZone, const string &querykey, const int best_match_len) { static int negqueryttl=::arg().asNum("negquery-cache-ttl"); DLOG(L<qname = inZone.substr( inZone.length() - foundkey.length(), string::npos ); - if(zoneId) - *zoneId = soa->domain_id; DLOG(L<qname< *domains, bool include_disabled=false) { } /** Determines if we are authoritative for a zone, and at what level */ - virtual bool getAuth(DNSPacket *p, SOAData *sd, const string &target, int *zoneId, const int best_match_len); + virtual bool getAuth(DNSPacket *p, SOAData *sd, const string &target, const int best_match_len); struct KeyData { unsigned int id; @@ -400,14 +400,14 @@ class DNSReversedBackend : public DNSBackend { virtual bool getAuthZone( string &rev_zone ) { return false; }; // Must be overridden /* Once the record has been found, this will be called to get the data - * associated with the record so the backend can set up soa and zoneId - * respectively. soa->qname does not need to be set. Return false if + * associated with the record so the backend can set up soa. + * soa->qname does not need to be set. Return false if * there is a problem getting the data. * */ virtual bool getAuthData( SOAData &soa, DNSPacket *p=0) { return false; }; // Must be overridden - bool getAuth(DNSPacket *p, SOAData *soa, const string &inZone, int *zoneId, const int best_match_len); - inline int _getAuth(DNSPacket *p, SOAData *soa, const string &inZone, int *zoneId, const string &querykey, const int best_match_len); + bool getAuth(DNSPacket *p, SOAData *soa, const string &inZone, const int best_match_len); + inline int _getAuth(DNSPacket *p, SOAData *soa, const string &inZone, const string &querykey, const int best_match_len); /* Only called for stuff like signing or AXFR transfers */ bool _getSOA(const string &rev_zone, SOAData &soa, DNSPacket *p); diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc index 2a0833dbb0..a879e740f3 100644 --- a/pdns/packethandler.cc +++ b/pdns/packethandler.cc @@ -986,8 +986,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse) *shouldRecurse=false; DNSResourceRecord rr; SOAData sd; - sd.db=0; - + string subdomain=""; string soa; int retargetcount=0; @@ -1116,7 +1115,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse) return r; } - if(!B.getAuth(p, &sd, target, 0)) { + if(!B.getAuth(p, &sd, target)) { DLOG(L<d.ra) { DLOG(L<* domains) } } -bool UeberBackend::getAuth(DNSPacket *p, SOAData *sd, const string &target, int *zoneId) +bool UeberBackend::getAuth(DNSPacket *p, SOAData *sd, const string &target) { int best_match_len = -1; bool from_cache = false; // Was this result fetched from the cache? @@ -312,7 +312,7 @@ bool UeberBackend::getAuth(DNSPacket *p, SOAData *sd, const string &target, int } for(vector::const_iterator i=backends.begin(); i!=backends.end();++i) - if((*i)->getAuth(p, sd, target, zoneId, best_match_len)) { + if((*i)->getAuth(p, sd, target, best_match_len)) { best_match_len = sd->qname.length(); from_cache = false; diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh index d6e1e06f32..1c2ef20e96 100644 --- a/pdns/ueberbackend.hh +++ b/pdns/ueberbackend.hh @@ -102,7 +102,7 @@ public: void lookup(const QType &, const string &qdomain, DNSPacket *pkt_p=0, int zoneId=-1); - bool getAuth(DNSPacket *p, SOAData *sd, const string &target, int *zoneId); + bool getAuth(DNSPacket *p, SOAData *sd, const string &target); bool getSOA(const string &domain, SOAData &sd, DNSPacket *p=0); bool getSOAUncached(const string &domain, SOAData &sd, DNSPacket *p=0); // same, but ignores cache bool list(const string &target, int domain_id, bool include_disabled=false); diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc index c62788dce6..3e54042a3b 100644 --- a/pdns/ws-auth.cc +++ b/pdns/ws-auth.cc @@ -414,7 +414,7 @@ static void gatherRecords(const Value& container, vector& new DNSPacket fakePacket; SOAData sd; fakePacket.qtype = QType::PTR; - if (!B.getAuth(&fakePacket, &sd, ptr.qname, 0)) + if (!B.getAuth(&fakePacket, &sd, ptr.qname)) throw ApiException("Could not find domain for PTR '"+ptr.qname+"' requested for '"+ptr.content+"'"); ptr.domain_id = sd.domain_id; @@ -1049,7 +1049,7 @@ static void patchZone(HttpRequest* req, HttpResponse* resp) { sd.db = (DNSBackend *)-1; // getAuth() cache bypass fakePacket.qtype = QType::PTR; - if (!B.getAuth(&fakePacket, &sd, rr.qname, 0)) + if (!B.getAuth(&fakePacket, &sd, rr.qname)) throw ApiException("Could not find domain for PTR '"+rr.qname+"' requested for '"+rr.content+"' (while saving)"); sd.db->startTransaction(rr.qname);