From db7dcbb1fb2a728a86efeb83b6e0598da5349fec Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 20 Jul 2016 14:49:04 +0200
Subject: [PATCH] rec: RPZ default policy should also override local data RRs

---
 pdns/rpzloader.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 90a2dace3..46bd4c168 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)
-- 
2.40.0