From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 8 Dec 2023 17:01:06 +0000 (+0100)
Subject: dnsdist: Fix compilation issue
X-Git-Tag: dnsdist-1.9.0-alpha4~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13591%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Fix compilation issue

Introduced by a conflict between #12922 and #13556.
---

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index c842b0641f..60e9638765 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -2656,7 +2656,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
       checkAllParametersConsumed("addDOH3Local", vars);
     }
     g_doh3locals.push_back(frontend);
-    auto clientState = std::make_unique<ClientState>(frontend->d_local, false, reusePort, tcpFastOpenQueueSize, interface, cpus);
+    auto clientState = std::make_unique<ClientState>(frontend->d_local, false, reusePort, tcpFastOpenQueueSize, interface, cpus, enableProxyProtocol);
     clientState->doh3Frontend = frontend;
     clientState->d_additionalAddresses = std::move(additionalAddresses);
 
@@ -2691,9 +2691,10 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
     std::string interface;
     std::set<int> cpus;
     std::vector<std::pair<ComboAddress, int>> additionalAddresses;
+    bool enableProxyProtocol = true;
 
     if (vars) {
-      parseLocalBindVars(vars, reusePort, tcpFastOpenQueueSize, interface, cpus, tcpListenQueueSize, maxInFlightQueriesPerConn, tcpMaxConcurrentConnections);
+      parseLocalBindVars(vars, reusePort, tcpFastOpenQueueSize, interface, cpus, tcpListenQueueSize, maxInFlightQueriesPerConn, tcpMaxConcurrentConnections, enableProxyProtocol);
       if (maxInFlightQueriesPerConn > 0) {
         frontend->d_quicheParams.d_maxInFlight = maxInFlightQueriesPerConn;
       }