From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 27 Aug 2018 13:35:34 +0000 (+0200)
Subject: ixfrdist: Correctly retrieve the SOAs from the diff if needed
X-Git-Tag: dnsdist-1.3.3~143^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb8b74cc5da2c28517e5216346e355b6d295d403;p=thirdparty%2Fpdns.git

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.
---

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);
   }
 }