From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 10 Jan 2019 10:28:05 +0000 (+0100)
Subject: Fix nits
X-Git-Tag: rec-4.2.0-alpha1~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0ddd1309584b81106e0003e40b47ffae585eada;p=pdns

Fix nits
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 5c8614b66..bca2aeaaa 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() && !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 7cb26a564..33ba48f0c 100644
--- 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