Fix nits

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 5c8614b662e430351bd36eae7a33a9ba33ec6678..bca2aeaaabf6a93988530d62184d5e80abaf7a01 100644 (file)
--- 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() && !variableAnswer)) {
+    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;

diff --git a/regression-tests.dnsdist/test_Caching.py b/regression-tests.dnsdist/test_Caching.py
index 7cb26a5648cd71fb77b7f7198aaa5cd04995c1e4..33ba48f0ced955ebb3e50f6f1708080f5a6da889 100644 (file)
--- a/regression-tests.dnsdist/test_Caching.py
+++ b/regression-tests.dnsdist/test_Caching.py
@@ -1831,8 +1831,6 @@ class TestCachingScopeZero(DNSDistTest):
             (receivedQuery, receivedResponse) = sender(query, scopedResponse)
             receivedQuery.id = expectedQuery.id
             self.checkMessageEDNSWithECS(expectedQuery, receivedQuery)
-            print(receivedResponse)
-            print(expectedResponse)
             self.checkMessageEDNSWithECS(receivedResponse, expectedResponse)
 
         # it should still have been cached, though, so the next query should be a hit