From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 14 Sep 2020 21:55:19 +0000 (+0200)
Subject: FIXME400
X-Git-Tag: auth-4.4.0-alpha2~31^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2a77b2805d1e9aa7dd6e46ae037ed10ac8ea6e8;p=thirdparty%2Fpdns.git

FIXME400
---

diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index 5c8d295029..47b3d3aa71 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -264,7 +264,6 @@ bool DNSBackend::getSOA(const DNSName &domain, SOAData &sd)
   if(!sd.hostmaster.countLabels()) {
     if (!arg().isEmpty("default-soa-mail")) {
       sd.hostmaster= DNSName(arg()["default-soa-mail"]);
-      // attodot(sd.hostmaster); FIXME400
     }
     else
       sd.hostmaster=DNSName("hostmaster")+domain;
diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index bb016dedca..018fba3059 100644
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -656,7 +656,7 @@ public:
   static void report(void);
   NSECRecordContent()
   {}
-  NSECRecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone?
+  NSECRecordContent(const string& content, const DNSName& zone=DNSName());
 
   static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
   static std::shared_ptr<DNSRecordContent> make(const string& content);
@@ -694,7 +694,7 @@ public:
   static void report(void);
   NSEC3RecordContent()
   {}
-  NSEC3RecordContent(const string& content, const string& zone=""); //FIXME400: DNSName& zone?
+  NSEC3RecordContent(const string& content, const DNSName& zone=DNSName());
 
   static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
   static std::shared_ptr<DNSRecordContent> make(const string& content);
@@ -738,7 +738,7 @@ public:
   static void report(void);
   NSEC3PARAMRecordContent()
   {}
-  NSEC3PARAMRecordContent(const string& content, const string& zone=""); // FIXME400: DNSName& zone?
+  NSEC3PARAMRecordContent(const string& content, const DNSName& zone=DNSName());
 
   static std::shared_ptr<DNSRecordContent> make(const DNSRecord &dr, PacketReader& pr);
   static std::shared_ptr<DNSRecordContent> make(const string& content);
diff --git a/pdns/nsec3dig.cc b/pdns/nsec3dig.cc
index d448b2eec4..d86219b1c2 100644
--- a/pdns/nsec3dig.cc
+++ b/pdns/nsec3dig.cc
@@ -176,10 +176,7 @@ try
       }
       // nsec3.insert(new nsec3()
       // cerr<<toBase32Hex(r.d_nexthash)<<endl;
-      vector<string> parts;
-      string sname=i->first.d_name.toString();
-      boost::split(parts, sname /* FIXME400 */, boost::is_any_of("."));
-      nsec3s.insert(make_pair(toLower(parts[0]), toBase32Hex(r->d_nexthash)));
+      nsec3s.insert(make_pair(toLower(i->first.d_name.getRawLabel(0)), toBase32Hex(r->d_nexthash)));
       nsec3salt = r->d_salt;
       nsec3iters = r->d_iterations;
     }
diff --git a/pdns/nsecrecords.cc b/pdns/nsecrecords.cc
index 3b16bad873..7f340d9a8b 100644
--- a/pdns/nsecrecords.cc
+++ b/pdns/nsecrecords.cc
@@ -174,9 +174,9 @@ std::shared_ptr<DNSRecordContent> NSECRecordContent::make(const string& content)
   return std::make_shared<NSECRecordContent>(content);
 }
 
-NSECRecordContent::NSECRecordContent(const string& content, const string& zone)
+NSECRecordContent::NSECRecordContent(const string& content, const DNSName& zone)
 {
-  RecordTextReader rtr(content, DNSName(zone));
+  RecordTextReader rtr(content, zone);
   rtr.xfrName(d_next);
 
   while(!rtr.eof()) {
@@ -223,9 +223,9 @@ std::shared_ptr<DNSRecordContent> NSEC3RecordContent::make(const string& content
   return std::make_shared<NSEC3RecordContent>(content);
 }
 
-NSEC3RecordContent::NSEC3RecordContent(const string& content, const string& zone)
+NSEC3RecordContent::NSEC3RecordContent(const string& content, const DNSName& zone)
 {
-  RecordTextReader rtr(content, DNSName(zone));
+  RecordTextReader rtr(content, zone);
   rtr.xfr8BitInt(d_algorithm);
   rtr.xfr8BitInt(d_flags);
   rtr.xfr16BitInt(d_iterations);
@@ -297,9 +297,9 @@ std::shared_ptr<DNSRecordContent> NSEC3PARAMRecordContent::make(const string& co
   return std::make_shared<NSEC3PARAMRecordContent>(content);
 }
 
-NSEC3PARAMRecordContent::NSEC3PARAMRecordContent(const string& content, const string& zone) 
+NSEC3PARAMRecordContent::NSEC3PARAMRecordContent(const string& content, const DNSName& zone)
 {
-  RecordTextReader rtr(content, DNSName(zone));
+  RecordTextReader rtr(content, zone);
   rtr.xfr8BitInt(d_algorithm); 
   rtr.xfr8BitInt(d_flags); 
   rtr.xfr16BitInt(d_iterations); 
diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index d43e370444..10055079c3 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -122,7 +122,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr,
     if (rrType == QType::NSEC3PARAM) {
       g_log<<Logger::Notice<<msgPrefix<<"Adding/updating NSEC3PARAM for zone, resetting ordernames."<<endl;
 
-      *ns3pr = NSEC3PARAMRecordContent(rr->d_content->getZoneRepresentation(), di->zone.toString() /* FIXME400 huh */);
+      *ns3pr = NSEC3PARAMRecordContent(rr->d_content->getZoneRepresentation(), di->zone);
       *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, *ns3pr, (*narrow));
       *haveNSEC3 = true;
@@ -336,7 +336,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr,
               ordername=DNSName(toBase32Hex(hashQNameWithSalt(*ns3pr, *qname)));
 
             if (*narrow)
-              di->backend->updateDNSSECOrderNameAndAuth(di->id, rr->d_name, DNSName(), auth); // FIXME400 no *qname here?
+              di->backend->updateDNSSECOrderNameAndAuth(di->id, *qname, DNSName(), auth);
             else
               di->backend->updateDNSSECOrderNameAndAuth(di->id, *qname, ordername, auth);
 
@@ -366,7 +366,7 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr,
       if (rr->d_class == QClass::ANY)
         d_dk.unsetNSEC3PARAM(rr->d_name);
       else if (rr->d_class == QClass::NONE) {
-        NSEC3PARAMRecordContent nsec3rr(rr->d_content->getZoneRepresentation(), di->zone.toString() /* FIXME400 huh */);
+        NSEC3PARAMRecordContent nsec3rr(rr->d_content->getZoneRepresentation(), di->zone);
         if (*haveNSEC3 && ns3pr->getZoneRepresentation() == nsec3rr.getZoneRepresentation())
           d_dk.unsetNSEC3PARAM(rr->d_name);
         else