From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 8 Oct 2018 09:08:20 +0000 (+0200)
Subject: make "zeroScope" ECS be sensitive to variableAnswer from Lua as well
X-Git-Tag: rec-4.2.0-alpha1~42^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98cc7baeb9673d1c7ea653177936baf5b5f3a9a2;p=thirdparty%2Fpdns.git

make "zeroScope" ECS be sensitive to variableAnswer from Lua as well
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 42196b7e05..5c8614b662 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1486,7 +1486,7 @@ static void startDoResolve(void *p)
     }
   sendit:;
 
-    if(g_useIncomingECS && dc->d_ecsFound && !sr.wasVariable()) {
+    if(g_useIncomingECS && dc->d_ecsFound && (!sr.wasVariable() && !variableAnswer)) {
       //      cerr<<"Stuffing in a 0 scope because answer is static"<<endl;
       EDNSSubnetOpts eo;
       eo.source = dc->d_ednssubnet.source;