diff --git a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc index 2407b35a26b9..30597d3b5e79 100644 --- a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc +++ b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc @@ -710,7 +710,7 @@ static void loadBinds(const ::rust::Vec(ComboAddress(std::string(bind.listen_address), defaultPort), false, bind.reuseport, bind.tcp.fast_open_queue_size, std::string(bind.interface), cpus, false); #if defined(HAVE_DNSCRYPT) - state->dnscryptCtx = dnsCryptContext; + state->dnscryptCtx = std::move(dnsCryptContext); #endif /* defined(HAVE_DNSCRYPT) */ #if defined(HAVE_XSK) if (xskMap) { @@ -739,7 +739,7 @@ static void loadWebServer(const dnsdist::rust::settings::WebserverConfiguration& catch (const PDNSException& e) { throw std::runtime_error(std::string("Error parsing the bind address for the webserver: ") + e.reason); } - dnsdist::configuration::updateRuntimeConfiguration([local, webConfig](dnsdist::configuration::RuntimeConfiguration& config) { + dnsdist::configuration::updateRuntimeConfiguration([local, &webConfig](dnsdist::configuration::RuntimeConfiguration& config) { config.d_webServerAddress = local; if (!webConfig.password.empty()) { auto holder = std::make_shared(std::string(webConfig.password), webConfig.hash_plaintext_credentials); @@ -872,7 +872,7 @@ static void handleLoggingConfiguration(const dnsdist::rust::settings::LoggingCon } } - dnsdist::logging::LoggingConfiguration::setStructuredLogging(true, levelPrefix); + dnsdist::logging::LoggingConfiguration::setStructuredLogging(true, std::move(levelPrefix)); } } @@ -1310,7 +1310,7 @@ std::shared_ptr getLimitTTLResponseAction(const LimitT capTypes.insert(QType(type)); } - auto action = dnsdist::actions::getLimitTTLResponseAction(config.min, config.max, capTypes); + auto action = dnsdist::actions::getLimitTTLResponseAction(config.min, config.max, std::move(capTypes)); return newDNSResponseActionWrapper(std::move(action), config.name); } @@ -1432,7 +1432,7 @@ std::shared_ptr getDnstapLogAction(const DnstapLogActionConfig } dnsdist::actions::DnstapAlterFunction alterFunc; dnsdist::configuration::yaml::getLuaFunctionFromConfiguration(alterFunc, config.alter_function_name, config.alter_function_code, config.alter_function_file, "dnstap log action"); - auto action = dnsdist::actions::getDnstapLogAction(std::string(config.identity), logger, alterFunc); + auto action = dnsdist::actions::getDnstapLogAction(std::string(config.identity), std::move(logger), std::move(alterFunc)); return newDNSActionWrapper(std::move(action), config.name); #endif } @@ -1448,7 +1448,7 @@ std::shared_ptr getDnstapLogResponseAction(const Dnsta } dnsdist::actions::DnstapAlterResponseFunction alterFunc; dnsdist::configuration::yaml::getLuaFunctionFromConfiguration(alterFunc, config.alter_function_name, config.alter_function_code, config.alter_function_file, "dnstap log response action"); - auto action = dnsdist::actions::getDnstapLogResponseAction(std::string(config.identity), logger, alterFunc); + auto action = dnsdist::actions::getDnstapLogResponseAction(std::string(config.identity), std::move(logger), std::move(alterFunc)); return newDNSResponseActionWrapper(std::move(action), config.name); #endif } diff --git a/pdns/dnsdistdist/dnsdist-lua-actions.cc b/pdns/dnsdistdist/dnsdist-lua-actions.cc index 65cd1d085338..0f8f4f40e930 100644 --- a/pdns/dnsdistdist/dnsdist-lua-actions.cc +++ b/pdns/dnsdistdist/dnsdist-lua-actions.cc @@ -229,7 +229,7 @@ void setupLuaActions(LuaContext& luaCtx) capTypes.insert(QType(type)); } } - return dnsdist::actions::getLimitTTLResponseAction(min, max, capTypes); + return dnsdist::actions::getLimitTTLResponseAction(min, max, std::move(capTypes)); }); luaCtx.writeFunction("SetMinTTLResponseAction", [](uint32_t min) { diff --git a/pdns/dnsdistdist/dnsdist-lua.cc b/pdns/dnsdistdist/dnsdist-lua.cc index b9119ea4969c..562120caf0a0 100644 --- a/pdns/dnsdistdist/dnsdist-lua.cc +++ b/pdns/dnsdistdist/dnsdist-lua.cc @@ -2104,7 +2104,7 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck) } setLuaSideEffect(); if (facility.type() == typeid(std::string)) { - auto facilityStr = boost::get(facility); + const auto& facilityStr = boost::get(facility); auto facilityLevel = logFacilityFromString(facilityStr); if (!facilityLevel) { g_outputBuffer = "Unknown facility '" + facilityStr + "' passed to setSyslogFacility()!\n";