Merge branch 'master' into rec-dump-rpz

diff --cc pdns/filterpo.cc
Simple merge

diff --cc pdns/filterpo.hh
index 3e757914dca80c8c69855d03ac59f4c73ac453a8,da68956a267ceb4786d79a800d2c8bcdb475c14a..4e729f55d525aeb586de2db753b7f5506ba71457
--- 1/pdns/filterpo.hh
--- 2/pdns/filterpo.hh
+++ b/pdns/filterpo.hh
@@@ -75,13 -76,11 +77,15 @@@ public
      {
        return d_kind == rhs.d_kind; // XXX check d_custom too!
      }
 +    std::string getKindToString() const;
      DNSRecord getCustomRecord(const DNSName& qname) const;
 +    DNSRecord getRecord(const DNSName& qname) const;
 +
 +    PolicyKind d_kind;
      std::shared_ptr<DNSRecordContent> d_custom;
      std::shared_ptr<std::string> d_name;
+     PolicyKind d_kind;
+     PolicyType d_type;
      int32_t d_ttl;
    };
  

diff --cc pdns/rec_channel_rec.cc
Simple merge

diff --cc pdns/reczones.cc
Simple merge