From: Otto Moerbeek Date: Mon, 6 May 2024 14:27:32 +0000 (+0200) Subject: Apply suggestions from code review X-Git-Tag: rec-5.1.0-alpha1~9^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=276a77d62f07bcaf7e950c83d2d0e46db54e9684;p=thirdparty%2Fpdns.git Apply suggestions from code review Co-authored-by: Remi Gacogne --- diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc index de94371b4e..3de3fbc6fe 100644 --- a/pdns/recursordist/rec_channel_rec.cc +++ b/pdns/recursordist/rec_channel_rec.cc @@ -2204,7 +2204,7 @@ static RecursorControlChannel::Answer luaconfig(T begin, T end) { if (begin != end) { if (g_luaSettingsInYAML) { - return {1, "Unable to reload Lua script from '" + ::arg()["lua-config-file"] + " as there is not active Lua configuration\n"}; + return {1, "Unable to reload Lua script from '" + ::arg()["lua-config-file"] + " as there is no active Lua configuration\n"}; } ::arg().set("lua-config-file") = *begin; } diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc index b3c335732f..6f206a3d7a 100644 --- a/pdns/recursordist/settings/cxxsupport.cc +++ b/pdns/recursordist/settings/cxxsupport.cc @@ -760,7 +760,7 @@ void fromLuaToRust(const FrameStreamExportConfig& fsc, pdns::rust::settings::rec dnstap.servers.emplace_back(server); } dnstap.logQueries = fsc.logQueries; - dnstap.logResponses = fsc.logQueries; + dnstap.logResponses = fsc.logResponses; dnstap.bufferHint = fsc.bufferHint; dnstap.flushTimeout = fsc.flushTimeout; dnstap.inputQueueSize = fsc.inputQueueSize; @@ -1295,7 +1295,7 @@ void pdns::settings::rec::fromBridgeStructToLuaConfig(const pdns::rust::settings fromRustToLuaConfig(settings.incoming.proxymappings, proxyMapping); } -// Return true if an item that's (also) a Lua config ite is set +// Return true if an item that's (also) a Lua config item is set bool pdns::settings::rec::luaItemSet(const pdns::rust::settings::rec::Recursorsettings& settings) { bool alldefault = true; diff --git a/pdns/recursordist/settings/docs-new-preamble-in.rst b/pdns/recursordist/settings/docs-new-preamble-in.rst index 564bc30b01..feb5939f46 100644 --- a/pdns/recursordist/settings/docs-new-preamble-in.rst +++ b/pdns/recursordist/settings/docs-new-preamble-in.rst @@ -390,7 +390,7 @@ As of version 5.1.0, an allowed addtional qtype entry is defined as: .. code-block:: yaml - qtype: string represeting a QType + qtype: string representing a QType targets: [] Sequence of string representing QType mode: One of Ignore, CacheOnly, CacheOnlyRequireAuth, ResolveImmediately, ResolveDeferred, default CacheOnlyRequireAuth