From 3343ad1fa84be1b43445a4105c601f01e297458b Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Wed, 8 Jul 2015 20:46:05 +0200 Subject: [PATCH] FIXME400 --- modules/tinydnsbackend/tinydnsbackend.cc | 2 +- pdns/backends/gsql/gsqlbackend.cc | 2 +- pdns/backends/gsql/ssql.hh | 2 +- pdns/dns.hh | 2 +- pdns/dnsbackend.cc | 12 ++++++------ pdns/dnslabeltext.rl | 2 +- pdns/dnsname.cc | 2 +- pdns/dnsname.hh | 2 +- pdns/dnspacket.cc | 2 +- pdns/dnsparser.cc | 8 ++++---- pdns/dnsparser.hh | 12 ++++++------ pdns/dnsrecords.hh | 12 ++++++------ pdns/dnssecinfra.cc | 6 +++--- pdns/dnswriter.cc | 4 ++-- pdns/lua-auth.cc | 2 +- pdns/misc.cc | 2 +- pdns/misc.hh | 4 ++-- pdns/nsec3dig.cc | 2 +- pdns/packethandler.cc | 2 +- pdns/packethandler.hh | 2 +- pdns/rfc2136handler.cc | 8 ++++---- pdns/saxfr.cc | 2 +- pdns/syncres.cc | 2 +- pdns/syncres.hh | 4 ++-- pdns/tcpreceiver.cc | 4 ++-- pdns/test-zoneparser_tng_cc.cc | 2 +- pdns/ueberbackend.cc | 2 +- pdns/ws-auth.cc | 2 +- 28 files changed, 55 insertions(+), 55 deletions(-) diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc index 4425d3005..e22352114 100644 --- a/modules/tinydnsbackend/tinydnsbackend.cc +++ b/modules/tinydnsbackend/tinydnsbackend.cc @@ -157,7 +157,7 @@ void TinyDNSBackend::getAllDomains(vector *domains, bool include_dis bool TinyDNSBackend::list(const DNSName &target, int domain_id, bool include_disabled) { d_isAxfr=true; - string key = target.toDNSString(); // FIXME bug: no lowercase here? or promise that from core? + string key = target.toDNSString(); // FIXME400 bug: no lowercase here? or promise that from core? d_cdbReader=new CDB(getArg("dbfile")); return d_cdbReader->searchSuffix(key); } diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index deea1c1a6..d3f2e3f6e 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -1243,7 +1243,7 @@ bool GSQLBackend::feedRecord(const DNSResourceRecord &r, string *ordername) bind("qtype",r.qtype.getName())-> bind("domain_id",r.domain_id)-> bind("disabled",r.disabled)-> - bind("qname",stripDot(r.qname.toString())); // FIXME lowercase? + bind("qname",stripDot(r.qname.toString())); // FIXME400 lowercase? if (ordername == NULL) d_InsertRecordOrderQuery_stmt->bindNull("ordername"); else diff --git a/pdns/backends/gsql/ssql.hh b/pdns/backends/gsql/ssql.hh index 7a21c27cb..293b2dce2 100644 --- a/pdns/backends/gsql/ssql.hh +++ b/pdns/backends/gsql/ssql.hh @@ -47,7 +47,7 @@ public: virtual SSqlStatement* bind(const string& name, unsigned long long value)=0; virtual SSqlStatement* bind(const string& name, const std::string& value)=0; SSqlStatement* bind(const string& name, const DNSName& value) { - return bind(name, toLower(value.toStringNoDot())); // FIXME toLower()? + return bind(name, toLower(value.toStringNoDot())); // FIXME400 toLower()? } virtual SSqlStatement* bindNull(const string& name)=0; virtual SSqlStatement* execute()=0;; diff --git a/pdns/dns.hh b/pdns/dns.hh index 2c0b763e6..0821d05e0 100644 --- a/pdns/dns.hh +++ b/pdns/dns.hh @@ -34,7 +34,7 @@ #include #include class DNSBackend; -class DNSName; // FIXME +class DNSName; // FIXME400 struct SOAData { diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc index f03d1092f..f0353163a 100644 --- a/pdns/dnsbackend.cc +++ b/pdns/dnsbackend.cc @@ -255,7 +255,7 @@ bool DNSBackend::getSOA(const DNSName &domain, SOAData &sd, DNSPacket *p) if(!sd.hostmaster.countLabels()) { if (!arg().isEmpty("default-soa-mail")) { sd.hostmaster=arg()["default-soa-mail"]; - // attodot(sd.hostmaster); FIXME + // attodot(sd.hostmaster); FIXME400 } else sd.hostmaster=DNSName("hostmaster")+domain; @@ -279,9 +279,9 @@ bool DNSBackend::getSOA(const DNSName &domain, SOAData &sd, DNSPacket *p) bool DNSBackend::getBeforeAndAfterNames(uint32_t id, const DNSName& zonename, const DNSName& qname, DNSName& before, DNSName& after) { - // FIXME FIXME FIXME - // string lcqname=toLower(qname); FIXME tolower? - // string lczonename=toLower(zonename); FIXME tolower? + // FIXME400 FIXME400 FIXME400 + // string lcqname=toLower(qname); FIXME400 tolower? + // string lczonename=toLower(zonename); FIXME400 tolower? // lcqname=makeRelative(lcqname, lczonename); DNSName lczonename = DNSName(toLower(zonename.toString())); // lcqname=labelReverse(lcqname); @@ -294,8 +294,8 @@ bool DNSBackend::getBeforeAndAfterNames(uint32_t id, const DNSName& zonename, co before = DNSName(labelReverse(sbefore)) + lczonename; after = DNSName(labelReverse(safter)) + lczonename; - // before=dotConcat(labelReverse(before), lczonename); FIXME - // after=dotConcat(labelReverse(after), lczonename); FIXME + // before=dotConcat(labelReverse(before), lczonename); FIXME400 + // after=dotConcat(labelReverse(after), lczonename); FIXME400 return ret; } diff --git a/pdns/dnslabeltext.rl b/pdns/dnslabeltext.rl index 2f628376f..300c2022d 100644 --- a/pdns/dnslabeltext.rl +++ b/pdns/dnslabeltext.rl @@ -97,7 +97,7 @@ deque segmentDNSName(const string& input ) string realinput; if(input.empty() || input == ".") return ret; - if(input[input.size()-1]!='.') realinput=input+"."; // FIXME YOLO + if(input[input.size()-1]!='.') realinput=input+"."; // FIXME400 YOLO else realinput=input; const char *p = realinput.c_str(), *pe = realinput.c_str() + realinput.length(); diff --git a/pdns/dnsname.cc b/pdns/dnsname.cc index f6191149f..8e953db86 100644 --- a/pdns/dnsname.cc +++ b/pdns/dnsname.cc @@ -241,7 +241,7 @@ bool DNSName::operator==(const DNSName& rhs) const size_t hash_value(DNSName const& d) { boost::hash hasher; - return hasher(toLower(d.toString())); // FIXME HACK + return hasher(toLower(d.toString())); // FIXME400 HACK } string DNSName::escapeLabel(const std::string& label) diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh index f3dc15c3b..8be308a24 100644 --- a/pdns/dnsname.hh +++ b/pdns/dnsname.hh @@ -46,7 +46,7 @@ public: DNSName labelReverse() const; bool isWildcard() const; unsigned int countLabels() const; - size_t length() const; // FIXME remove me? + size_t length() const; // FIXME400 remove me? bool empty() const { return d_empty; } bool isRoot() const { return !d_empty && d_storage.empty(); } void clear() { d_storage.clear(); d_empty=true; } diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index a0cd86e8c..e5c90e0c3 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -633,7 +633,7 @@ bool checkForCorrectTSIG(const DNSPacket* q, UeberBackend* B, DNSName* keyname, return false; } - DNSName algoName = trc->d_algoName; // FIXME + DNSName algoName = trc->d_algoName; // FIXME400 if (algoName == "hmac-md5.sig-alg.reg.int") algoName = "hmac-md5"; diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc index a02cc45f8..c445ce46b 100644 --- a/pdns/dnsparser.cc +++ b/pdns/dnsparser.cc @@ -80,7 +80,7 @@ private: vector d_record; }; -//FIXME lots of overlap with DNSPacketWriter::xfrName +//FIXME400 lots of overlap with DNSPacketWriter::xfrName static const string EncodeDNSLabel(const DNSName& input) { if(!input.countLabels()) // otherwise we encode .. (long story) @@ -483,11 +483,11 @@ void PacketReader::xfrHexBlob(string& blob, bool keepReading) xfrBlob(blob); } -//FIXME remove this method completely +//FIXME400 remove this method completely string simpleCompress(const string& elabel, const string& root) { string label=elabel; - // FIXME: this relies on the semi-canonical escaped output from getName + // FIXME400: this relies on the semi-canonical escaped output from getName if(strchr(label.c_str(), '\\')) { boost::replace_all(label, "\\.", "."); boost::replace_all(label, "\\032", " "); @@ -512,7 +512,7 @@ string simpleCompress(const string& elabel, const string& root) } -// FIXME this function needs to go +// FIXME400 this function needs to go void simpleExpandTo(const string& label, unsigned int frompos, string& ret) { unsigned int labellen=0; diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh index 70266c481..f605b4055 100644 --- a/pdns/dnsparser.hh +++ b/pdns/dnsparser.hh @@ -190,7 +190,7 @@ public: void doRecordCheck(const struct DNSRecord&){} - DNSName label; // FIXME rename + DNSName label; // FIXME400 rename struct dnsrecordheader header; typedef DNSRecordContent* makerfunc_t(const struct DNSRecord& dr, PacketReader& pr); @@ -263,7 +263,7 @@ protected: struct DNSRecord { - DNSName d_label; //FIXME rename + DNSName d_label; //FIXME400 rename std::shared_ptr d_content; uint16_t d_type; uint16_t d_class; @@ -279,8 +279,8 @@ struct DNSRecord if(rhs.d_content) rzrp=toLower(rhs.d_content->getZoneRepresentation()); - string llabel=toLower(d_label.toString()); //FIXME - string rlabel=toLower(rhs.d_label.toString()); //FIXME + string llabel=toLower(d_label.toString()); //FIXME400 + string rlabel=toLower(rhs.d_label.toString()); //FIXME400 return tie(llabel, d_type, d_class, lzrp) < @@ -295,8 +295,8 @@ struct DNSRecord if(rhs.d_content) rzrp=toLower(rhs.d_content->getZoneRepresentation()); - string llabel=toLower(d_label.toString()); //FIXME - string rlabel=toLower(rhs.d_label.toString()); //FIXME + string llabel=toLower(d_label.toString()); //FIXME400 + string rlabel=toLower(rhs.d_label.toString()); //FIXME400 return tie(llabel, d_type, d_class, lzrp) == diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh index 016fa8a39..685f28d2f 100644 --- a/pdns/dnsrecords.hh +++ b/pdns/dnsrecords.hh @@ -413,7 +413,7 @@ public: static void report(void); NSECRecordContent() : DNSRecordContent(47) {} - NSECRecordContent(const string& content, const string& zone=""); //DNSNameFIXME: DNSName& zone? + NSECRecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone? static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); static DNSRecordContent* make(const string& content); @@ -430,7 +430,7 @@ public: static void report(void); NSEC3RecordContent() : DNSRecordContent(50) {} - NSEC3RecordContent(const string& content, const string& zone=""); //DNSNameFIXME: DNSName& zone? + NSEC3RecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone? static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); static DNSRecordContent* make(const string& content); @@ -455,7 +455,7 @@ public: static void report(void); NSEC3PARAMRecordContent() : DNSRecordContent(51) {} - NSEC3PARAMRecordContent(const string& content, const string& zone=""); // DNSNameFIXME: DNSName& zone? + NSEC3PARAMRecordContent(const string& content, const string& zone=""); // FIXME400: DNSName& zone? static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); static DNSRecordContent* make(const string& content); @@ -496,7 +496,7 @@ public: static void report(void); WKSRecordContent() : DNSRecordContent(QType::WKS) {} - WKSRecordContent(const string& content, const string& zone=""); // FIXMEDNSName: DNSName& zone? + WKSRecordContent(const string& content, const string& zone=""); // FIXME400: DNSName& zone? static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); static DNSRecordContent* make(const string& content); @@ -514,7 +514,7 @@ public: EUI48RecordContent() : DNSRecordContent(QType::EUI48) {}; static void report(void); static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); - static DNSRecordContent* make(const string& zone); // FIXMEDNSName: DNSName& zone? + static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone? void toPacket(DNSPacketWriter& pw); string getZoneRepresentation() const; private: @@ -528,7 +528,7 @@ public: EUI64RecordContent() : DNSRecordContent(QType::EUI64) {}; static void report(void); static DNSRecordContent* make(const DNSRecord &dr, PacketReader& pr); - static DNSRecordContent* make(const string& zone); // FIXMEDNSName: DNSName& zone? + static DNSRecordContent* make(const string& zone); // FIXME400: DNSName& zone? void toPacket(DNSPacketWriter& pw); string getZoneRepresentation() const; private: diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc index 728c41779..3a01ad05e 100644 --- a/pdns/dnssecinfra.cc +++ b/pdns/dnssecinfra.cc @@ -294,7 +294,7 @@ string getMessageForRRSET(const DNSName& qname, const RRSIGRecordContent& rrc, v toHash.resize(toHash.size() - rrc.d_signature.length()); // chop off the end, don't sign the signature! BOOST_FOREACH(shared_ptr& add, signRecords) { - toHash.append(qname.toDNSString()); // FIXME tolower? + toHash.append(qname.toDNSString()); // FIXME400 tolower? uint16_t tmp=htons(rrc.d_type); toHash.append((char*)&tmp, 2); tmp=htons(1); // class @@ -313,7 +313,7 @@ string getMessageForRRSET(const DNSName& qname, const RRSIGRecordContent& rrc, v DSRecordContent makeDSFromDNSKey(const DNSName& qname, const DNSKEYRecordContent& drc, int digest) { string toHash; - toHash.assign(qname.toDNSString()); // FIXME tolower? + toHash.assign(qname.toDNSString()); // FIXME400 tolower? toHash.append(const_cast(drc).serialize("", true, true)); DSRecordContent dsrc; @@ -570,7 +570,7 @@ string makeTSIGMessageFromTSIGPacket(const string& opacket, unsigned int tsigOff dw.xfrName(keyname, false); dw.xfr16BitInt(QClass::ANY); // class dw.xfr32BitInt(0); // TTL - // dw.xfrName(toLower(trc.d_algoName), false); //FIXME + // dw.xfrName(toLower(trc.d_algoName), false); //FIXME400 dw.xfrName(trc.d_algoName, false); } diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc index 6ac0aa71d..53803f599 100644 --- a/pdns/dnswriter.cc +++ b/pdns/dnswriter.cc @@ -201,7 +201,7 @@ void DNSPacketWriter::xfrName(const DNSName& name, bool compress) { //cerr<<"xfrName: name=["< parts = name.getRawLabels(); // labelparts_t parts; @@ -256,7 +256,7 @@ void DNSPacketWriter::xfrName(const DNSName& name, bool compress) d_record.push_back(labelsize); unsigned int len=d_record.size(); d_record.resize(len + labelsize); - memcpy(((&*d_record.begin()) + len), label.c_str(), labelsize); // FIXME do not want memcpy + memcpy(((&*d_record.begin()) + len), label.c_str(), labelsize); // FIXME400 do not want memcpy pos+=labelsize+1; if(pos - startPos == 1) diff --git a/pdns/lua-auth.cc b/pdns/lua-auth.cc index 7b206eed7..89613de05 100644 --- a/pdns/lua-auth.cc +++ b/pdns/lua-auth.cc @@ -67,7 +67,7 @@ bool AuthLua::axfrfilter(const ComboAddress& remote, const DNSName& zone, const } lua_pushstring(d_lua, remote.toString().c_str() ); - lua_pushstring(d_lua, zone.toString().c_str() ); // FIXME expose DNSName to Lua? + lua_pushstring(d_lua, zone.toString().c_str() ); // FIXME400 expose DNSName to Lua? lua_pushstring(d_lua, in.qname.toString().c_str() ); lua_pushnumber(d_lua, in.qtype.getCode() ); lua_pushnumber(d_lua, in.ttl ); diff --git a/pdns/misc.cc b/pdns/misc.cc index cd9cdecb9..199639341 100644 --- a/pdns/misc.cc +++ b/pdns/misc.cc @@ -1011,7 +1011,7 @@ uint64_t udpErrorStats(const std::string& str) bool getTSIGHashEnum(const DNSName& algoName, TSIGHashEnum& algoEnum) { - if (algoName == "hmac-md5.sig-alg.reg.int." || algoName == "hmac-md5.") // FIXME + if (algoName == "hmac-md5.sig-alg.reg.int." || algoName == "hmac-md5.") // FIXME400 algoEnum = TSIG_MD5; else if (algoName == "hmac-sha1.") algoEnum = TSIG_SHA1; diff --git a/pdns/misc.hh b/pdns/misc.hh index 03950241e..eaeff786a 100644 --- a/pdns/misc.hh +++ b/pdns/misc.hh @@ -349,7 +349,7 @@ inline bool pdns_iequals(const std::string& a, const std::string& b) return true; } -// FIXME remove this, it's just here to move faster while we DNSName the things +// FIXME400 remove this, it's just here to move faster while we DNSName the things inline bool pdns_iequals(const DNSName& a, const DNSName& b) __attribute__((pure)); inline bool pdns_iequals(const DNSName& a, const DNSName& b) { @@ -438,7 +438,7 @@ private: #endif }; -// FIXME this should probably go? +// FIXME400 this should probably go? struct CIStringCompare: public std::binary_function { bool operator()(const string& a, const string& b) const diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc index 6860611e9..44bf4e525 100644 --- a/pdns/nsec3dig.cc +++ b/pdns/nsec3dig.cc @@ -135,7 +135,7 @@ try // cerr< parts; string sname=i->first.d_label.toString(); - boost::split(parts, sname /* FIXME */, boost::is_any_of(".")); + boost::split(parts, sname /* FIXME400 */, boost::is_any_of(".")); nsec3s.insert(make_pair(toLower(parts[0]), toBase32Hex(r.d_nexthash))); nsec3salt = r.d_salt; nsec3iters = r.d_iterations; diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc index 4d47c520a..b56997654 100644 --- a/pdns/packethandler.cc +++ b/pdns/packethandler.cc @@ -452,7 +452,7 @@ void emitNSEC3(UeberBackend& B, const NSEC3PARAMRecordContent& ns3prc, const SOA r->addRecord(rr); } -void PacketHandler::emitNSEC3(const NSEC3PARAMRecordContent& ns3prc, const SOAData& sd, const DNSName& unhashed, const string& begin, const string& end, /* FIXME unused */ const DNSName& toNSEC3, DNSPacket *r, int mode) +void PacketHandler::emitNSEC3(const NSEC3PARAMRecordContent& ns3prc, const SOAData& sd, const DNSName& unhashed, const string& begin, const string& end, /* FIXME400 unused */ const DNSName& toNSEC3, DNSPacket *r, int mode) { ::emitNSEC3(B, ns3prc, sd, unhashed, begin, end, toNSEC3, r, mode); diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh index a313fb3ef..de26e5e0d 100644 --- a/pdns/packethandler.hh +++ b/pdns/packethandler.hh @@ -78,7 +78,7 @@ private: void addNSEC(DNSPacket *p, DNSPacket* r, const DNSName &target, const DNSName &wildcard, const DNSName& auth, int mode); void addNSEC3(DNSPacket *p, DNSPacket* r, const DNSName &target, const DNSName &wildcard, const DNSName& auth, const NSEC3PARAMRecordContent& nsec3param, bool narrow, int mode); void emitNSEC(const DNSName& before, const DNSName& after, const DNSName& toNSEC, const SOAData& sd, DNSPacket *r, int mode); - void emitNSEC3(const NSEC3PARAMRecordContent &ns3rc, const SOAData& sd, const DNSName& unhashed, /* FIXME should this be DNSName? */ const string& begin, const string& end, const DNSName& toNSEC3, DNSPacket *r, int mode); + void emitNSEC3(const NSEC3PARAMRecordContent &ns3rc, const SOAData& sd, const DNSName& unhashed, /* FIXME400 should this be DNSName? */ const string& begin, const string& end, const DNSName& toNSEC3, DNSPacket *r, int mode); int processUpdate(DNSPacket *p); int forwardPacket(const string &msgPrefix, DNSPacket *p, DomainInfo *di); uint performUpdate(const string &msgPrefix, const DNSRecord *rr, DomainInfo *di, bool isPresigned, bool* narrow, bool* haveNSEC3, NSEC3PARAMRecordContent *ns3pr, bool *updatedSerial); diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc index 535c9775b..5fb06a916 100644 --- a/pdns/rfc2136handler.cc +++ b/pdns/rfc2136handler.cc @@ -119,7 +119,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr, if (rrType == QType::NSEC3PARAM) { L<d_content->getZoneRepresentation(), di->zone.toString() /* FIXME huh */); + NSEC3PARAMRecordContent nsec3param(rr->d_content->getZoneRepresentation(), di->zone.toString() /* FIXME400 huh */); *narrow = false; // adding a NSEC3 will cause narrow mode to be dropped, as you cannot specify that in a NSEC3PARAM record d_dk.setNSEC3PARAM(di->zone, nsec3param, (*narrow)); @@ -160,7 +160,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr, } else { di->backend->updateDNSSECOrderNameAndAuth(di->id, di->zone, qname, DNSName(), (ddepth == 0)); } - if (ddepth == 1 || dssets.count(qname)) // FIXME && ? + if (ddepth == 1 || dssets.count(qname)) // FIXME400 && ? di->backend->updateDNSSECOrderNameAndAuth(di->id, di->zone, qname, ordername, false, QType::DS); } return 1; @@ -357,7 +357,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr, ordername=DNSName(toBase32Hex(hashQNameWithSalt(ns3pr->d_iterations, ns3pr->d_salt, *qname)))+di->zone; if (*narrow) - di->backend->updateDNSSECOrderNameAndAuth(di->id, di->zone, rr->d_label, DNSName(), auth); // FIXME no *qname here? + di->backend->updateDNSSECOrderNameAndAuth(di->id, di->zone, rr->d_label, DNSName(), auth); // FIXME400 no *qname here? else di->backend->updateDNSSECOrderNameAndAuth(di->id, di->zone, *qname, ordername, auth); @@ -385,7 +385,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr, if (rr->d_class == QClass::ANY) d_dk.unsetNSEC3PARAM(rr->d_label); else if (rr->d_class == QClass::NONE) { - NSEC3PARAMRecordContent nsec3rr(rr->d_content->getZoneRepresentation(), di->zone.toString() /* FIXME huh */); + NSEC3PARAMRecordContent nsec3rr(rr->d_content->getZoneRepresentation(), di->zone.toString() /* FIXME400 huh */); if (ns3pr->getZoneRepresentation() == nsec3rr.getZoneRepresentation()) d_dk.unsetNSEC3PARAM(rr->d_label); else diff --git a/pdns/saxfr.cc b/pdns/saxfr.cc index ff05a0141..babf0cf60 100644 --- a/pdns/saxfr.cc +++ b/pdns/saxfr.cc @@ -314,7 +314,7 @@ try } for(auto &record: records) { - DNSName label /* FIXME rename */=record.first; + DNSName label /* FIXME400 rename */=record.first; if (isNSEC3 && unhash) { auto i = hashes.find(label.makeRelative(argv[3]).toStringNoDot()); diff --git a/pdns/syncres.cc b/pdns/syncres.cc index 5f4236d53..0b0f994d7 100644 --- a/pdns/syncres.cc +++ b/pdns/syncres.cc @@ -787,7 +787,7 @@ bool SyncRes::doCacheCheck(const DNSName &qname, const QType &qtype, vector b.countLabels(); diff --git a/pdns/syncres.hh b/pdns/syncres.hh index 930d2ec9b..92b3d8e6b 100644 --- a/pdns/syncres.hh +++ b/pdns/syncres.hh @@ -464,7 +464,7 @@ private: struct GetBestNSAnswer { DNSName qname; - set > bestns; // FIXME right side really should be DNSName too + set > bestns; // FIXME400 right side really should be DNSName too uint8_t qtype; // only A and AAAA anyhow bool operator<(const GetBestNSAnswer &b) const { @@ -531,7 +531,7 @@ struct PacketIDBirthdayCompare: public std::binary_function tie(b.remote, bSock, b.type)) return false; - return pdns_ilexicographical_compare(a.domain.toString(), b.domain.toString()); // FIXME + return pdns_ilexicographical_compare(a.domain.toString(), b.domain.toString()); // FIXME400 } }; extern __thread MemRecursorCache* t_RC; diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc index 4e30bff3e..5d25068b0 100644 --- a/pdns/tcpreceiver.cc +++ b/pdns/tcpreceiver.cc @@ -627,7 +627,7 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr q, int ou if(!tsigkeyname.empty()) { string tsig64; - DNSName algorithm=trc.d_algoName; // FIXME: check + DNSName algorithm=trc.d_algoName; // FIXME400: check if (algorithm == "hmac-md5.sig-alg.reg.int") algorithm = "hmac-md5"; if (algorithm != "gss-tsig") { @@ -1057,7 +1057,7 @@ int TCPNameserver::doIXFR(shared_ptr q, int outsock) if(!tsigkeyname.empty()) { string tsig64; - DNSName algorithm=trc.d_algoName; // FIXME: was toLowerCanonic, compare output + DNSName algorithm=trc.d_algoName; // FIXME400: was toLowerCanonic, compare output if (algorithm == "hmac-md5.sig-alg.reg.int") algorithm = "hmac-md5"; Lock l(&s_plock); diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc index 5c9c591cb..c8ff12da8 100644 --- a/pdns/test-zoneparser_tng_cc.cc +++ b/pdns/test-zoneparser_tng_cc.cc @@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(test_tng_record_types) { BOOST_CHECK_EQUAL(rr.ttl, ttl); BOOST_CHECK_EQUAL(rr.qtype.getName(), type); if (rr.qtype == QType::SOA) - continue; // FIXME remove trailing dots from data + continue; // FIXME400 remove trailing dots from data if (*(rr.content.rbegin()) != '.' && *(data.rbegin()) == '.') BOOST_CHECK_EQUAL(rr.content, std::string(data.begin(),data.end()-1)); else diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc index 6cd4b8fd2..a3e3f1de3 100644 --- a/pdns/ueberbackend.cc +++ b/pdns/ueberbackend.cc @@ -309,7 +309,7 @@ bool UeberBackend::getAuth(DNSPacket *p, SOAData *sd, const DNSName &target) for(vector::const_iterator i=backends.begin(); i!=backends.end();++i) if((*i)->getAuth(p, sd, target, best_match_len)) { - best_match_len = sd->qname.countLabels(); // FIXME + best_match_len = sd->qname.countLabels(); // FIXME400 from_cache = false; // Shortcut for the case that we got a direct hit - no need to go diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc index 0de69d4fa..6a7e72cb4 100644 --- a/pdns/ws-auth.cc +++ b/pdns/ws-auth.cc @@ -674,7 +674,7 @@ static void apiServerZones(HttpRequest* req, HttpResponse* resp) { sd.nameserver = arg()["default-soa-name"]; if (!arg().isEmpty("default-soa-mail")) { sd.hostmaster = arg()["default-soa-mail"]; - // attodot(sd.hostmaster); FIXME + // attodot(sd.hostmaster); FIXME400 } else { sd.hostmaster = "hostmaster." + zonename; } -- 2.40.0