From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Tue, 23 Jan 2018 11:21:22 +0000 (+0100)
Subject: Merge pull request #5068 from pieterlexis/issue-1010-calculateSOASerial-uint32_t
X-Git-Tag: dnsdist-1.3.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=810b4de4066e67c5723e256de7c0dbd78cb2c444;p=thirdparty%2Fpdns.git

Merge pull request #5068 from pieterlexis/issue-1010-calculateSOASerial-uint32_t

Change from time_t to uint32_t for serial in calculateSOASerial
---

810b4de4066e67c5723e256de7c0dbd78cb2c444
diff --cc pdns/dnsbackend.cc
index c9705f7dbe,660d872efc..dd4c3d9ba1
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@@ -248,10 -247,10 +248,10 @@@ bool DNSBackend::getSOA(const DNSName &
        sd.hostmaster=DNSName("hostmaster")+domain;
    }
  
 -  if(!sd.serial) { // magic time!
 +  if(!unmodifiedSerial && !sd.serial) { // magic time!
      DLOG(L<<Logger::Warning<<"Doing SOA serial number autocalculation for "<<rr.qname<<endl);
  
-     time_t serial;
+     uint32_t serial = 0;
      if (calculateSOASerial(domain, sd, serial)) {
        sd.serial = serial;
        //DLOG(L<<"autocalculated soa serialnumber for "<<rr.qname<<" is "<<newest<<endl);
diff --cc pdns/dnsbackend.hh
index 1c7c22a873,069b89d81a..4b14f57b8f
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@@ -125,10 -125,10 +125,10 @@@ public
    virtual ~DNSBackend(){};
  
    //! fills the soadata struct with the SOA details. Returns false if there is no SOA.
 -  virtual bool getSOA(const DNSName &name, SOAData &soadata);
 +  virtual bool getSOA(const DNSName &name, SOAData &soadata, bool unmodifiedSerial=false);
  
    //! Calculates a SOA serial for the zone and stores it in the third argument.
-   virtual bool calculateSOASerial(const DNSName& domain, const SOAData& sd, time_t& serial);
+   virtual bool calculateSOASerial(const DNSName& domain, const SOAData& sd, uint32_t& serial);
  
    virtual bool replaceRRSet(uint32_t domain_id, const DNSName& qname, const QType& qt, const vector<DNSResourceRecord>& rrset)
    {