From ba8ade8ec524dfdb4e8b5e65a8076a1978d0af67 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 20 Apr 2020 10:17:07 +0200
Subject: [PATCH] dnsdist: Avoid copies in for loops

Reported by clang's '-Wrange-loop-construct' since version 10.
---
 pdns/dnscrypt.cc             | 2 +-
 pdns/dnsdist-cache.cc        | 2 +-
 pdns/dnsdist-lua-bindings.cc | 8 ++++----
 pdns/dnsdist-lua.cc          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pdns/dnscrypt.cc b/pdns/dnscrypt.cc
index 653156a00a..db096659de 100644
--- a/pdns/dnscrypt.cc
+++ b/pdns/dnscrypt.cc
@@ -430,7 +430,7 @@ void DNSCryptContext::getCertificateResponse(time_t now, const DNSName& qname, u
   dh->rcode = RCode::NoError;
 
   ReadLock r(&d_lock);
-  for (const auto pair : d_certs) {
+  for (const auto& pair : d_certs) {
     if (!pair->active || !pair->cert.isValid(now)) {
       continue;
     }
diff --git a/pdns/dnsdist-cache.cc b/pdns/dnsdist-cache.cc
index 2736dc0480..c97c674453 100644
--- a/pdns/dnsdist-cache.cc
+++ b/pdns/dnsdist-cache.cc
@@ -460,7 +460,7 @@ uint64_t DNSDistPacketCache::dump(int fd)
     ReadLock w(&d_shards.at(shardIndex).d_lock);
     auto& map = d_shards[shardIndex].d_map;
 
-    for(const auto entry : map) {
+    for (const auto& entry : map) {
       const CacheValue& value = entry.second;
       count++;
 
diff --git a/pdns/dnsdist-lua-bindings.cc b/pdns/dnsdist-lua-bindings.cc
index 3089936fee..bc66083f1b 100644
--- a/pdns/dnsdist-lua-bindings.cc
+++ b/pdns/dnsdist-lua-bindings.cc
@@ -245,14 +245,14 @@ void setupLuaBindings(bool client)
       }
       if (name.type() == typeid(vector<pair<int, DNSName>>)) {
           auto names = boost::get<vector<pair<int, DNSName>>>(name);
-          for (auto const n : names) {
+          for (const auto& n : names) {
             smn.add(n.second);
           }
           return;
       }
       if (name.type() == typeid(vector<pair<int, string>>)) {
           auto names = boost::get<vector<pair<int, string>>>(name);
-          for (auto const n : names) {
+          for (const auto& n : names) {
             smn.add(n.second);
           }
           return;
@@ -272,14 +272,14 @@ void setupLuaBindings(bool client)
       }
       if (name.type() == typeid(vector<pair<int, DNSName>>)) {
           auto names = boost::get<vector<pair<int, DNSName>>>(name);
-          for (auto const n : names) {
+          for (const auto& n : names) {
             smn.remove(n.second);
           }
           return;
       }
       if (name.type() == typeid(vector<pair<int, string>>)) {
           auto names = boost::get<vector<pair<int, string>>>(name);
-          for (auto const n : names) {
+          for (const auto& n : names) {
             DNSName d(n.second);
             smn.remove(d);
           }
diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index f2423353ea..d51156e8ad 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -113,7 +113,7 @@ static void parseLocalBindVars(boost::optional<localbind_t> vars, bool& reusePor
       interface = boost::get<std::string>((*vars)["interface"]);
     }
     if (vars->count("cpus")) {
-      for (const auto cpu : boost::get<std::vector<std::pair<int,int>>>((*vars)["cpus"])) {
+      for (const auto& cpu : boost::get<std::vector<std::pair<int,int>>>((*vars)["cpus"])) {
         cpus.insert(cpu.second);
       }
     }
@@ -465,7 +465,7 @@ static void setupLuaConfig(bool client, bool configCheck)
       }
 
       if(vars.count("cpus")) {
-        for (const auto cpu : boost::get<vector<pair<int,string>>>(vars["cpus"])) {
+        for (const auto& cpu : boost::get<vector<pair<int,string>>>(vars["cpus"])) {
           cpus.insert(std::stoi(cpu.second));
         }
       }
-- 
2.47.2