From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 19 Feb 2020 09:46:05 +0000 (+0100)
Subject: dnsdist: DownstreamState::getName() should return a ref, not a temp
X-Git-Tag: rec-4.4.0-alpha0~16^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8842%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: DownstreamState::getName() should return a ref, not a temp
---

diff --git a/pdns/dnsdist-lua-bindings.cc b/pdns/dnsdist-lua-bindings.cc
index f86f79140d..4c26647b07 100644
--- a/pdns/dnsdist-lua-bindings.cc
+++ b/pdns/dnsdist-lua-bindings.cc
@@ -111,8 +111,8 @@ void setupLuaBindings(bool client)
       }
       s.setAuto();
     });
-  g_lua.registerFunction("getName", &DownstreamState::getName);
-  g_lua.registerFunction("getNameWithAddr", &DownstreamState::getNameWithAddr);
+  g_lua.registerFunction<std::string(DownstreamState::*)()>("getName", [](const DownstreamState& s) { return s.getName(); });
+  g_lua.registerFunction<std::string(DownstreamState::*)()>("getNameWithAddr", [](const DownstreamState& s) { return s.getNameWithAddr(); });
   g_lua.registerMember("upStatus", &DownstreamState::upStatus);
   g_lua.registerMember<int (DownstreamState::*)>("weight",
     [](const DownstreamState& s) -> int {return s.weight;},
diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index 99f85ee0c0..b78f500176 100644
--- a/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@ -851,10 +851,10 @@ struct DownstreamState
   void setUp() { availability = Availability::Up; }
   void setDown() { availability = Availability::Down; }
   void setAuto() { availability = Availability::Auto; }
-  string getName() const {
+  const string& getName() const {
     return name;
   }
-  string getNameWithAddr() const {
+  const string& getNameWithAddr() const {
     return nameWithAddr;
   }
   void setName(const std::string& newName)