From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 5 Jun 2025 13:47:14 +0000 (+0200)
Subject: Merge pull request #15389 from miodvallat/wittlching_hour
X-Git-Tag: dnsdist-2.0.0-beta1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb2f4050a5679f623cb07d98d0378bcf2cc39cb1;p=thirdparty%2Fpdns.git

Merge pull request #15389 from miodvallat/wittlching_hour

[tools] Honour default-ttl in pdnsutil load-zone
---

bb2f4050a5679f623cb07d98d0378bcf2cc39cb1
diff --cc pdns/zoneparser-tng.cc
index 8e2b56d52f,7a7e971c0d..c54c0d4091
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@@ -38,18 -38,18 +38,18 @@@
  
  const static string g_INstr("IN");
  
 -ZoneParserTNG::ZoneParserTNG(const string& fname, DNSName  zname, string  reldir, bool upgradeContent):
 +ZoneParserTNG::ZoneParserTNG(const string& fname, ZoneName zname, string reldir, bool upgradeContent):
    d_reldir(std::move(reldir)), d_zonename(std::move(zname)), d_defaultttl(3600),
    d_templatecounter(0), d_templatestop(0), d_templatestep(0),
-   d_havedollarttl(false), d_fromfile(true), d_upgradeContent(upgradeContent)
+   d_havespecificttl(false), d_fromfile(true), d_upgradeContent(upgradeContent)
  {
    stackFile(fname);
  }
  
 -ZoneParserTNG::ZoneParserTNG(const vector<string>& zonedata, DNSName  zname, bool upgradeContent):
 +ZoneParserTNG::ZoneParserTNG(const vector<string>& zonedata, ZoneName zname, bool upgradeContent):
    d_zonename(std::move(zname)), d_zonedata(zonedata), d_defaultttl(3600),
    d_templatecounter(0), d_templatestop(0), d_templatestep(0),
-   d_havedollarttl(false), d_fromfile(false), d_upgradeContent(upgradeContent)
+   d_havespecificttl(false), d_fromfile(false), d_upgradeContent(upgradeContent)
  {
    d_zonedataline = d_zonedata.begin();
  }