Merge pull request #7151 from aerique/rec41-sec-201810

PowerDNS Recursor 4.1.5

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/rec_channel_rec.cc
index 46a27e6a11b49b4729bf9e16d0cdbe9f4c810f8e,d9166a860068070ada8c60a0d07102944d510a8e..0ae865e7f1f2e6272914b37ba3a82619fa88e1bc
--- 1/pdns/rec_channel_rec.cc
--- 2/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@@ -537,12 -533,10 +537,12 @@@ string doAddTA(T begin, T end
    try {
      L<<Logger::Warning<<"Adding Trust Anchor for "<<who<<" with data '"<<what<<"', requested via control channel";
      g_luaconfs.modify([who, what](LuaConfigItems& lci) {
-       auto ds = unique_ptr<DSRecordContent>(dynamic_cast<DSRecordContent*>(DSRecordContent::make(what)));
+       auto ds=std::dynamic_pointer_cast<DSRecordContent>(DSRecordContent::make(what));
        lci.dsAnchors[who].insert(*ds);
        });
 +    broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeCache, who, true));
      broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, who, true));
 +    broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeAndCountNegCache, who, true));
      L<<Logger::Warning<<endl;
      return "Added Trust Anchor for " + who.toStringRootDot() + " with data " + what + "\n";
    }

diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge

diff --cc pdns/syncres.cc
Simple merge