From a0ddd1309584b81106e0003e40b47ffae585eada Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 10 Jan 2019 11:28:05 +0100 Subject: [PATCH] Fix nits --- pdns/pdns_recursor.cc | 2 +- regression-tests.dnsdist/test_Caching.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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"<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 -- 2.40.0