From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 7 Jun 2024 13:42:15 +0000 (+0200)
Subject: dnsdist: Fix shadowed variables
X-Git-Tag: rec-5.2.0-alpha1~172^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=233bdb1d6d7d925e7cee913bb4a935d5dbb57517;p=thirdparty%2Fpdns.git

dnsdist: Fix shadowed variables
---

diff --git a/pdns/dnsdistdist/dnsdist-discovery.cc b/pdns/dnsdistdist/dnsdist-discovery.cc
index 9c065e3569..07a2a85c6e 100644
--- a/pdns/dnsdistdist/dnsdist-discovery.cc
+++ b/pdns/dnsdistdist/dnsdist-discovery.cc
@@ -462,8 +462,8 @@ bool ServiceDiscovery::tryToUpgradeBackend(const UpgradeableBackend& backend)
 
     /* remove the existing backend if needed */
     if (!backend.keepAfterUpgrade) {
-      dnsdist::configuration::updateRuntimeConfiguration([&backend](dnsdist::configuration::RuntimeConfiguration& config) {
-        auto& backends = config.d_backends;
+      dnsdist::configuration::updateRuntimeConfiguration([&backend](dnsdist::configuration::RuntimeConfiguration& runtimeConfig) {
+        auto& backends = runtimeConfig.d_backends;
         for (auto backendIt = backends.begin(); backendIt != backends.end(); ++backendIt) {
           if (*backendIt == backend.d_ds) {
             backends.erase(backendIt);
diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc
index b70523bcae..4ee3f3a203 100644
--- a/pdns/dnsdistdist/dnsdist.cc
+++ b/pdns/dnsdistdist/dnsdist.cc
@@ -3436,8 +3436,8 @@ int main(int argc, char** argv)
         auto ret = std::make_shared<DownstreamState>(std::move(config), nullptr, true);
         addServerToPool("", ret);
         ret->start();
-        dnsdist::configuration::updateRuntimeConfiguration([&ret](dnsdist::configuration::RuntimeConfiguration& config) {
-          config.d_backends.push_back(std::move(ret));
+        dnsdist::configuration::updateRuntimeConfiguration([&ret](dnsdist::configuration::RuntimeConfiguration& runtimeConfig) {
+          runtimeConfig.d_backends.push_back(std::move(ret));
         });
       }
     }