From: aerique <aerique@xs4all.nl>
Date: Thu, 24 Aug 2017 08:23:26 +0000 (+0200)
Subject: Merge branch 'master' into rec-dump-rpz
X-Git-Tag: auth-4.1.0-rc1~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e9d829070cb8e9af420bf82f00048231f6f2a0;p=thirdparty%2Fpdns.git

Merge branch 'master' into rec-dump-rpz
---

85e9d829070cb8e9af420bf82f00048231f6f2a0
diff --cc pdns/filterpo.hh
index 3e757914dc,da68956a26..4e729f55d5
--- a/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;
    };