From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 22 Jul 2016 17:42:41 +0000 (+0200)
Subject: Recursor: Always log EDNS clientsubnet in trace
X-Git-Tag: rec-4.0.2~1^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480f55310967ed7555f31cc0e79198d28f3cbbd5;p=thirdparty%2Fpdns.git

Recursor: Always log EDNS clientsubnet in trace
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 76bf964aa1..a6af98d7fe 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -730,11 +730,8 @@ void startDoResolve(void *p)
     if(!g_quiet || tracedQuery) {
       L<<Logger::Warning<<t_id<<" ["<<MT->getTid()<<"/"<<MT->numProcesses()<<"] " << (dc->d_tcp ? "TCP " : "") << "question for '"<<dc->d_mdp.d_qname<<"|"
        <<DNSRecordContent::NumberToType(dc->d_mdp.d_qtype)<<"' from "<<dc->getRemote();
-#ifdef HAVE_PROTOBUF
-      if(!dc->d_ednssubnet.empty()) {
+      if(!dc->d_ednssubnet.empty())
         L<<" (ecs "<<dc->d_ednssubnet.toString()<<")";
-      }
-#endif
       L<<endl;
     }