From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 20 Feb 2020 15:03:39 +0000 (+0100)
Subject: dnsdist: Don't overwrite DoH frontends with 'setLocal()'
X-Git-Tag: rec-4.4.0-alpha0~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e52d278a97f6ae17e102348c2bde415cf7cdacc3;p=thirdparty%2Fpdns.git

dnsdist: Don't overwrite DoH frontends with 'setLocal()'
---

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 83b76a80c3..8ff462b09f 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -566,7 +566,7 @@ static void setupLuaConfig(bool client, bool configCheck)
 	ComboAddress loc(addr, 53);
         for (auto it = g_frontends.begin(); it != g_frontends.end(); ) {
           /* DoH, DoT and DNSCrypt frontends are separate */
-          if ((*it)->tlsFrontend == nullptr && (*it)->dnscryptCtx == nullptr) {
+          if ((*it)->tlsFrontend == nullptr && (*it)->dnscryptCtx == nullptr && (*it)->dohFrontend == nullptr) {
             it = g_frontends.erase(it);
           }
           else {