From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 17 Jan 2020 14:30:20 +0000 (+0100)
Subject: rec: Remove now useless references to '-2' for RPZ hits
X-Git-Tag: rec-4.3.0-rc1~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbd426682d2fdb40a05081d5bfa5fe13e74fcc1c;p=thirdparty%2Fpdns.git

rec: Remove now useless references to '-2' for RPZ hits

(cherry picked from commit 0a9fc756d4d3559ca999756cc6b451693b0467c8)
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 486bd2bee5..06a9b2f028 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -764,7 +764,7 @@ int SyncRes::doResolve(const DNSName &qname, const QType &qtype, vector<DNSRecor
  * \param beenthere
  * \param fromCache tells the caller the result came from the cache, may be nullptr
  * \param stopAtDelegation if non-nullptr and pointed-to value is Stop requests the callee to stop at a delegation, if so pointed-to value is set to Stopped
- * \return DNS RCODE or -1 (Error) or -2 (RPZ hit)
+ * \return DNS RCODE or -1 (Error)
  */
 int SyncRes::doResolveNoQNameMinimization(const DNSName &qname, const QType &qtype, vector<DNSRecord>&ret, unsigned int depth, set<GetBestNSAnswer>& beenthere, vState& state, bool *fromCache, StopAtDelegation *stopAtDelegation)
 {
@@ -886,9 +886,6 @@ int SyncRes::doResolveNoQNameMinimization(const DNSName &qname, const QType &qty
 
   LOG(prefix<<qname<<": failed (res="<<res<<")"<<endl);
 
-  if (res == -2)
-    return res;
-
   return res<0 ? RCode::ServFail : res;
 }
 
@@ -3425,7 +3422,6 @@ bool SyncRes::processAnswer(unsigned int depth, LWResult& lwr, const DNSName& qn
 
 /** returns:
  *  -1 in case of no results
- *  -2 when a FilterEngine Policy was hit
  *  rcode otherwise
  */
 int SyncRes::doResolveAt(NsSet &nameservers, DNSName auth, bool flawedNSSet, const DNSName &qname, const QType &qtype,