From ed07d64744a4fa58c418490cf1e1629a6d83fd72 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20B=C3=BChler?= Date: Thu, 28 Dec 2017 23:20:48 +0100 Subject: [PATCH] accept seconds since epoch in RRSIG timestamps too (fixes #6120) --- pdns/rcpgenerator.cc | 6 ++++++ pdns/test-dnsrecords_cc.cc | 2 ++ 2 files changed, 8 insertions(+) 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<