From fef06fa115cb4bf403390f7ae7d195f447818263 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 20 Jan 2026 12:32:35 +0100
Subject: [PATCH] dnsdist: Prevent copies while logging

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>
---
 pdns/dnsdistdist/dnsdist-dnsquestion.cc | 8 ++++----
 pdns/dnsdistdist/dnsdist-logging.cc     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pdns/dnsdistdist/dnsdist-dnsquestion.cc b/pdns/dnsdistdist/dnsdist-dnsquestion.cc
index cf7e7c656f..21b2521082 100644
--- a/pdns/dnsdistdist/dnsdist-dnsquestion.cc
+++ b/pdns/dnsdistdist/dnsdist-dnsquestion.cc
@@ -65,7 +65,7 @@ std::shared_ptr<const Logr::Logger> DNSQuestion::getThisLogger(std::shared_ptr<c
   if (d_logger) {
     return d_logger;
   }
-  return ids.getLogger(parent);
+  return ids.getLogger(std::move(parent));
 }
 
 std::shared_ptr<const Logr::Logger> DNSResponse::getThisLogger(std::shared_ptr<const Logr::Logger> parent) const
@@ -73,7 +73,7 @@ std::shared_ptr<const Logr::Logger> DNSResponse::getThisLogger(std::shared_ptr<c
   if (d_logger) {
     return d_logger;
   }
-  auto logger = DNSQuestion::getThisLogger(parent);
+  auto logger = DNSQuestion::getThisLogger(std::move(parent));
   if (data.size() >= sizeof(dnsheader)) {
     const auto header = getHeader();
     logger = logger->withValues("dns.response.rcode", Logging::Loggable(RCode::to_s(header->rcode)));
@@ -88,7 +88,7 @@ std::shared_ptr<const Logr::Logger> DNSResponse::getThisLogger(std::shared_ptr<c
 
 std::shared_ptr<const Logr::Logger> DNSQuestion::getLogger(std::shared_ptr<const Logr::Logger> parent) const
 {
-  return getThisLogger(parent);
+  return getThisLogger(std::move(parent));
 }
 
 std::shared_ptr<const Logr::Logger> DNSQuestion::getLogger(std::shared_ptr<const Logr::Logger> parent)
@@ -96,6 +96,6 @@ std::shared_ptr<const Logr::Logger> DNSQuestion::getLogger(std::shared_ptr<const
   if (d_logger) {
     return d_logger;
   }
-  d_logger = getThisLogger(parent);
+  d_logger = getThisLogger(std::move(parent));
   return d_logger;
 }
diff --git a/pdns/dnsdistdist/dnsdist-logging.cc b/pdns/dnsdistdist/dnsdist-logging.cc
index 29be70378e..5fbe6a47a9 100644
--- a/pdns/dnsdistdist/dnsdist-logging.cc
+++ b/pdns/dnsdistdist/dnsdist-logging.cc
@@ -219,7 +219,7 @@ void setup(const std::string& backend)
   }
 
   if (logger) {
-    std::atomic_store_explicit(&s_topLogger, logger, std::memory_order_release);
+    std::atomic_store_explicit(&s_topLogger, std::move(logger), std::memory_order_release);
   }
 }
 
-- 
2.47.3