From: Leon Xu <cassvin91@gmail.com>
Date: Thu, 11 Jan 2018 09:49:25 +0000 (+0800)
Subject: Backport bugfix from #6172: IXFR shouldn't remove RRs which aren't in deleted list
X-Git-Tag: auth-4.1.1^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=561b2ec08e6cbd96cf3b88f9922ba3b55cf4d57f;p=pdns

Backport bugfix from #6172: IXFR shouldn't remove RRs which aren't in deleted list

(cherry picked from commit 668624c8c617a40482a28b3c168701abed55aef0)
---

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 4b6da4dbf..732699024 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -137,8 +137,9 @@ void CommunicatorClass::ixfrSuck(const DNSName &domain, const TSIGTriplet& tt, c
         vector<DNSRecord> rrset;
         {
           DNSZoneRecord zrr;
-          B.lookup(QType(g.first.second), g.first.first, 0, di.id);
+          B.lookup(QType(g.first.second), g.first.first+domain, 0, di.id);
           while(B.get(zrr)) {
+            zrr.dr.d_name.makeUsRelative(domain);
             rrset.push_back(zrr.dr);
           }
         }