Fix ifdef botch

diff --git a/pdns/recursordist/lwres.cc b/pdns/recursordist/lwres.cc
index 432ca1e56a8645a990c4a3a4f08726c267b26c5b..1e89ae84b03e7d20c105682ee4fadb3904ae45ea 100644 (file)
--- a/pdns/recursordist/lwres.cc
+++ b/pdns/recursordist/lwres.cc
@@ -118,8 +118,9 @@ void remoteLoggerQueueData(RemoteLoggerInterface& rli, const std::string& data)
   }
 }
 
-#ifdef HAVE_FSTRM
 #include "dnstap.hh"
+
+#ifdef HAVE_FSTRM
 #include "fstrm_logger.hh"
 
 static bool isEnabledForQueries(const std::shared_ptr<std::vector<std::unique_ptr<FrameStreamLogger>>>& fstreamLoggers)
@@ -650,9 +651,11 @@ static LWResult::Result asyncresolve(const OptLog& log, const ComboAddress& addr
         socklen_t slen = address.getSocklen();
         (void)getsockname(queryfd, reinterpret_cast<sockaddr*>(&localip), &slen); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast))
       }
+#ifdef HAVE_FSTRM
       if (fstrmQEnabled) {
         logFstreamQuery(fstrmLoggers, queryTime, localip, address, DnstapMessage::ProtocolType::DoUDP, context.d_auth ? context.d_auth : boost::none, vpacket);
       }
+#endif
     }
 
     // sleep until we see an answer to this, interface to mtasker

diff --git a/pdns/recursordist/resolve-context.hh b/pdns/recursordist/resolve-context.hh
index c4b38c3d566627456a62b30bf861e01218ae524c..ba16b8bad90113715bdc015185e1e0ea9867b906 100644 (file)
--- a/pdns/recursordist/resolve-context.hh
+++ b/pdns/recursordist/resolve-context.hh
@@ -44,7 +44,5 @@ struct ResolveContext
 
   boost::optional<const boost::uuids::uuid&> d_initialRequestId;
   DNSName d_nsName;
-#ifdef HAVE_FSTRM
   boost::optional<const DNSName&> d_auth;
-#endif
 };

diff --git a/pdns/recursordist/syncres.cc b/pdns/recursordist/syncres.cc
index 9b386ab2948bf4d72a4d1a713674dce8220f07aa..7663492df471b06efe5e2024b49816f609252d33 100644 (file)
--- a/pdns/recursordist/syncres.cc
+++ b/pdns/recursordist/syncres.cc
@@ -1474,9 +1474,7 @@ LWResult::Result SyncRes::asyncresolveWrapper(const OptLog& log, const ComboAddr
   int EDNSLevel = 0;
   auto luaconfsLocal = g_luaconfs.getLocal();
   ResolveContext ctx(d_initialRequestId, nsName);
-#ifdef HAVE_FSTRM
   ctx.d_auth = auth;
-#endif
 
   LWResult::Result ret{};