From 10bf69c528ea1fd2591eec571782403f2fe12a8f Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Fri, 24 Mar 2023 18:26:13 +0100 Subject: [PATCH] dnsdist: Fix 'Unknown key' issue for actions and rules parameters The parameters were properly parsed but not marked as consumed, leading to warnings such as: ``` addAction: Unknown key 'name' given - ignored ``` --- pdns/dnsdist-lua-rules.cc | 2 +- pdns/dnsdist-lua.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pdns/dnsdist-lua-rules.cc b/pdns/dnsdist-lua-rules.cc index 7100cf72be..47639365d9 100644 --- a/pdns/dnsdist-lua-rules.cc +++ b/pdns/dnsdist-lua-rules.cc @@ -67,7 +67,7 @@ static boost::uuids::uuid makeRuleID(std::string& id) return getUniqueID(id); } -void parseRuleParams(boost::optional params, boost::uuids::uuid& uuid, std::string& name, uint64_t& creationOrder) +void parseRuleParams(boost::optional& params, boost::uuids::uuid& uuid, std::string& name, uint64_t& creationOrder) { static uint64_t s_creationOrder = 0; diff --git a/pdns/dnsdist-lua.hh b/pdns/dnsdist-lua.hh index 6fb357595b..61a021fedf 100644 --- a/pdns/dnsdist-lua.hh +++ b/pdns/dnsdist-lua.hh @@ -161,7 +161,7 @@ using luaruleparams_t = LuaAssociativeTable; using nmts_t = NetmaskTree; std::shared_ptr makeRule(const luadnsrule_t& var); -void parseRuleParams(boost::optional params, boost::uuids::uuid& uuid, std::string& name, uint64_t& creationOrder); +void parseRuleParams(boost::optional& params, boost::uuids::uuid& uuid, std::string& name, uint64_t& creationOrder); void checkParameterBound(const std::string& parameter, uint64_t value, size_t max = std::numeric_limits::max()); vector> setupLua(LuaContext& luaCtx, bool client, bool configCheck, const std::string& config); -- 2.47.2