From: Stefan Bühler Date: Thu, 28 Dec 2017 22:20:48 +0000 (+0100) Subject: accept seconds since epoch in RRSIG timestamps too (fixes #6120) X-Git-Tag: dnsdist-1.3.0~172^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6124%2Fhead;p=thirdparty%2Fpdns.git accept seconds since epoch in RRSIG timestamps too (fixes #6120) --- diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc index 0b606424b3..c31579f76f 100644 --- a/pdns/rcpgenerator.cc +++ b/pdns/rcpgenerator.cc @@ -79,6 +79,12 @@ void RecordTextReader::xfrTime(uint32_t &val) uint64_t itmp; xfr64BitInt(itmp); + if (itmp <= (uint32_t)~0) { + // formatted as seconds since epoch, not as YYYYMMDDHHmmSS: + val = (uint32_t) itmp; + return; + } + ostringstream tmp; tmp<