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

Change from time_t to uint32_t for serial in calculateSOASerial

diff --cc pdns/backends/gsql/gsqlbackend.cc
Simple merge

diff --cc pdns/dnsbackend.cc
index c9705f7dbe2ff4769bd55b5cf94f6f296ebdc359,660d872efc99b7f4434ae831187f916f903c740e..dd4c3d9ba131ad2d3453b9a88d1a1644ad0e3ab8
--- 1/pdns/dnsbackend.cc
--- 2/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 1c7c22a8735c2b6a9ee9f2b3ee37a58339d0b2ba,069b89d81ac6a86dbded1a9da742b4abd8d25926..4b14f57b8f308a867f7b8b5bf18b4c37723cfd45
--- 1/pdns/dnsbackend.hh
--- 2/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)
    {