From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 30 Oct 2019 17:24:38 +0000 (+0100)
Subject: auth: Disable '$GENERATE' in comfun, ixfrdist, ixplore
X-Git-Tag: dnsdist-1.4.0~22^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45bf6885a78a690ecdca1bca9e2a1e7f197d0353;p=thirdparty%2Fpdns.git

auth: Disable '$GENERATE' in comfun, ixfrdist, ixplore
---

diff --git a/pdns/comfun.cc b/pdns/comfun.cc
index a2bf399f6a..3884cdb8a0 100644
--- a/pdns/comfun.cc
+++ b/pdns/comfun.cc
@@ -311,6 +311,7 @@ void printStats()
 int parseZone(const std::string& str, unsigned int limit)
 {
   ZoneParserTNG zpt(str);
+  zpt.disableGenerate();
   DNSResourceRecord rr;
 
   std::thread stats(printStats);
@@ -517,6 +518,7 @@ try
     }
     cerr<<"Have "<<powerdns.size()<<" known NS names that are PowerDNS"<<endl;
     ZoneParserTNG zpt(argv[2]);
+    zpt.disableGenerate();
     DNSResourceRecord rr;
     
     set<DNSName> seen, pdnsdomains;
diff --git a/pdns/ixfrutils.cc b/pdns/ixfrutils.cc
index 59e514c1f9..cf38c1c1f2 100644
--- a/pdns/ixfrutils.cc
+++ b/pdns/ixfrutils.cc
@@ -163,6 +163,7 @@ void loadZoneFromDisk(records_t& records, const string& fname, const DNSName& zo
 {
   ZoneParserTNG zpt(fname, zone);
 
+  zpt.disableGenerate();
   DNSResourceRecord rr;
   bool seenSOA=false;
   while(zpt.get(rr)) {
@@ -189,6 +190,7 @@ void loadZoneFromDisk(records_t& records, const string& fname, const DNSName& zo
 void loadSOAFromDisk(const DNSName& zone, const string& fname, shared_ptr<SOARecordContent>& soa, uint32_t& soaTTL)
 {
   ZoneParserTNG zpt(fname, zone);
+  zpt.disableGenerate();
   DNSResourceRecord rr;
 
   while(zpt.get(rr)) {