Merge pull request #15389 from miodvallat/wittlching_hour

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

diff --cc pdns/pdnsutil.cc
Simple merge

diff --cc pdns/zoneparser-tng.cc
index 8e2b56d52f69a9f0dcb0142f5402874c8dd7e437,7a7e971c0db058c9d50d7191df5418d57316aac2..c54c0d40912c1aeab1b62071c8b35c4c737e097d
--- 1/pdns/zoneparser-tng.cc
--- 2/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();
  }

diff --cc pdns/zoneparser-tng.hh
Simple merge