Process review comments from rgacogne

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 3c76a6125a68703b9c4ffca5b737c78be963a441..a2cd2e28d64fb6c99bcf017d220242a32b042843 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -326,8 +326,8 @@ testrunner_SOURCES = \
        ratelimitedlog.hh \
        rcpgenerator.cc \
        rec-eventtrace.cc rec-eventtrace.hh \
-       rec-responsestats.hh rec-responsestats.cc \
        rec-nsspeeds.cc rec-nsspeeds.hh \
+       rec-responsestats.hh rec-responsestats.cc \
        rec-rust-lib/cxxsupport.cc \
        rec-system-resolve.hh rec-system-resolve.cc \
        rec-taskqueue.cc rec-taskqueue.hh \

diff --git a/pdns/recursordist/docs/lua-scripting/functions.rst b/pdns/recursordist/docs/lua-scripting/functions.rst
index 298b9d09772e24695b133a629cfc68f70b3dce69..3786b871e9bf43baafa4ef7fb33890365dd5dd1c 100644 (file)
--- a/pdns/recursordist/docs/lua-scripting/functions.rst
+++ b/pdns/recursordist/docs/lua-scripting/functions.rst
@@ -67,7 +67,7 @@ These are some functions that don't really have a place in one of the other cate
 
 .. function:: getConfigDirAndName() -> str, str
 
-   .. versionadded:: 5.2.x
+   .. versionadded:: 5.3.0
 
    Get the configuration directory and the instance name.
    These two values correspond to the :ref:`setting-yaml-recursor.config_dir` and :ref:`setting-yaml-recursor.config_name` settings.

diff --git a/pdns/recursordist/protozero-helpers.hh b/pdns/recursordist/protozero-helpers.hh
index 468578b37e66702f006e6a9ad0fe03ab1e56487b..95d79920abb0a2264f0e1c12f9c134488a9dd907 100644 (file)
--- a/pdns/recursordist/protozero-helpers.hh
+++ b/pdns/recursordist/protozero-helpers.hh
@@ -94,5 +94,5 @@ template <typename T>
 void decodeNetmask(protozero::pbf_message<T>& message, Netmask& subnet)
 {
   auto data = message.get_bytes();
-  memcpy(&subnet, data.data(), data.size());
+  memcpy(&subnet, data.data(), std::min(sizeof(subnet), data.size()));
 }