From fb8b74cc5da2c28517e5216346e355b6d295d403 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 27 Aug 2018 15:35:34 +0200 Subject: [PATCH] ixfrdist: Correctly retrieve the SOAs from the diff if needed They might be passed to makeIXFRDiff(), and the code to handle the case where they aren't was broken. --- pdns/ixfrdist.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc index dc05c91f05..cd849dadfd 100644 --- a/pdns/ixfrdist.cc +++ b/pdns/ixfrdist.cc @@ -198,11 +198,11 @@ static void makeIXFRDiff(const records_t& from, const records_t& to, ixfrdiff_t& set_difference(to.cbegin(), to.cend(), from.cbegin(), from.cend(), back_inserter(diff.additions), from.value_comp()); diff.oldSOA = fromSOA; if (fromSOA == nullptr) { - getSOAFromRecords(from); + diff.oldSOA = getSOAFromRecords(from); } diff.newSOA = toSOA; if (toSOA == nullptr) { - getSOAFromRecords(to); + diff.newSOA = getSOAFromRecords(to); } } -- 2.47.2