From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 23 Aug 2016 07:14:36 +0000 (+0200)
Subject: Revert "Recursor: Always log EDNS clientsubnet in trace"
X-Git-Tag: rec-4.0.2~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e986f5ec9f819b247d3a5f5031072bbf765fe4e;p=thirdparty%2Fpdns.git

Revert "Recursor: Always log EDNS clientsubnet in trace"

This reverts commit 601b188c559fb9d58392bc2115ddd583225ee52c.

`dc->d_ednssubnet` is only available when protobuf support is enabled.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index b111d07962..fa2b40c9c0 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -729,8 +729,11 @@ 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();
-      if(!dc->d_ednssubnet.empty())
+#ifdef HAVE_PROTOBUF
+      if(!dc->d_ednssubnet.empty()) {
         L<<" (ecs "<<dc->d_ednssubnet.toString()<<")";
+      }
+#endif
       L<<endl;
     }