From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 20 Jul 2016 12:49:04 +0000 (+0200)
Subject: rec: RPZ default policy should also override local data RRs
X-Git-Tag: auth-4.0.1~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db7dcbb1fb2a728a86efeb83b6e0598da5349fec;p=thirdparty%2Fpdns.git

rec: RPZ default policy should also override local data RRs
---

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 90a2dace32..46bd4c168b 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -62,9 +62,14 @@ void RPZRecordToPolicy(const DNSRecord& dr, DNSFilterEngine& target, const std::
     }
   }
   else {
-    pol.d_kind = DNSFilterEngine::PolicyKind::Custom;
-    pol.d_custom = dr.d_content;
-    // cerr<<"Wants custom "<<dr.d_content->getZoneRepresentation()<<" for "<<dr.d_name<<": ";
+    if (defpol) {
+      pol=*defpol;
+    }
+    else {
+      pol.d_kind = DNSFilterEngine::PolicyKind::Custom;
+      pol.d_custom = dr.d_content;
+      // cerr<<"Wants custom "<<dr.d_content->getZoneRepresentation()<<" for "<<dr.d_name<<": ";
+    }
   }
 
   if(pol.d_ttl < 0)