From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 17 Jul 2017 21:56:47 +0000 (+0200)
Subject: auth: scopeMask in the SOAData structure is unused after #5512
X-Git-Tag: dnsdist-1.3.3~45^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7057%2Fhead;p=thirdparty%2Fpdns.git

auth: scopeMask in the SOAData structure is unused after #5512
---

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index cc0af2adac..078c556ad8 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -844,7 +844,6 @@ bool RemoteBackend::calculateSOASerial(const DNSName& domain, const SOAData& sd,
          { "expire", static_cast<int>(sd.expire) },
          { "default_ttl", static_cast<int>(sd.default_ttl) },
          { "domain_id", static_cast<int>(sd.domain_id) },
-         { "scopeMask", sd.scopeMask }
        }}
      }}
    };
diff --git a/pdns/dns.hh b/pdns/dns.hh
index bb990dc6ac..53554ee509 100644
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -37,7 +37,7 @@ struct DNSRecord;
 
 struct SOAData
 {
-  SOAData() : ttl(0), serial(0), refresh(0), retry(0), expire(0), default_ttl(0), db(0), domain_id(-1), scopeMask(0) {};
+  SOAData() : ttl(0), serial(0), refresh(0), retry(0), expire(0), default_ttl(0), db(0), domain_id(-1) {};
 
   DNSName qname;
   DNSName nameserver;
@@ -50,7 +50,6 @@ struct SOAData
   uint32_t default_ttl;
   DNSBackend *db;
   int domain_id;
-  uint8_t scopeMask;
 };
 
 class RCode
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index ba072c3304..025b693923 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -234,7 +234,6 @@ bool DNSBackend::getSOA(const DNSName &domain, SOAData &sd, bool unmodifiedSeria
     fillSOAData(rr.content, sd);
     sd.domain_id=rr.domain_id;
     sd.ttl=rr.ttl;
-    sd.scopeMask = rr.scopeMask;
   }
 
   if(!hits)
diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 415e283430..d1c9afdc5a 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -979,7 +979,6 @@ void PacketHandler::makeNXDomain(DNSPacket* p, DNSPacket* r, const DNSName& targ
   rr.domain_id=sd.domain_id;
   rr.dr.d_place=DNSResourceRecord::AUTHORITY;
   rr.auth = 1;
-  rr.scopeMask = sd.scopeMask;
   r->addRecord(rr);
 
   if(d_dk.isSecuredZone(sd.qname))