]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Fix shadowed variables
authorRemi Gacogne <remi.gacogne@powerdns.com>
Fri, 7 Jun 2024 13:42:15 +0000 (15:42 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 15 Jul 2024 09:44:05 +0000 (11:44 +0200)
pdns/dnsdistdist/dnsdist-discovery.cc
pdns/dnsdistdist/dnsdist.cc

index 9c065e35698347f1cc1eaf6d89106731496d8c89..07a2a85c6e70ffe4deeb7c293872917b83c6b78a 100644 (file)
@@ -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);
index b70523bcae7d35f3caf6972ef51aaa2cd2484096..4ee3f3a203024202da0423f2356550893015a5eb 100644 (file)
@@ -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));
         });
       }
     }