From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 19 Jul 2021 09:07:47 +0000 (+0200)
Subject: Merge branch 'master' into rec-warnings
X-Git-Tag: dnsdist-1.7.0-alpha1~89^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10571%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'master' into rec-warnings
---

5a00d3a3b9f0aa09abc1d162c99e5908353c9c4e
diff --cc pdns/lwres.cc
index 6a7bd73445,ca578ce6a5..7bec6f8ae4
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@@ -296,9 -296,10 +296,11 @@@ LWResult::Result asyncresolve(const Com
  
    // We only store the localip if needed for fstrm logging
    ComboAddress localip;
 -  bool fstrmQEnabled = false;
 -  bool fstrmREnabled = false;
+   bool dnsOverTLS = false;
  #ifdef HAVE_FSTRM
 +  bool fstrmQEnabled = false;
 +  bool fstrmREnabled = false;
++  
    if (isEnabledForQueries(fstrmLoggers)) {
      fstrmQEnabled = true;
    }