From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Mon, 19 Mar 2018 12:38:57 +0000 (+0100)
Subject: dnsdist: correct typos in doc, adjust regression test
X-Git-Tag: dnsdist-1.3.0~46^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6363%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: correct typos in doc, adjust regression test
---

diff --git a/pdns/dnsdist-lua.hh b/pdns/dnsdist-lua.hh
index 97c6fb29f7..19c5f39655 100644
--- a/pdns/dnsdist-lua.hh
+++ b/pdns/dnsdist-lua.hh
@@ -24,7 +24,7 @@
 class LuaAction : public DNSAction
 {
 public:
-  typedef std::function<std::tuple<int, boost::optional<string> >(DNSQuestion* dr)> func_t;
+  typedef std::function<std::tuple<int, boost::optional<string> >(DNSQuestion* dq)> func_t;
   LuaAction(LuaAction::func_t func) : d_func(func)
   {}
   Action operator()(DNSQuestion* dq, string* ruleresult) const override;
diff --git a/pdns/dnsdistdist/docs/reference/constants.rst b/pdns/dnsdistdist/docs/reference/constants.rst
index 5adcdd1e8f..176bd11180 100644
--- a/pdns/dnsdistdist/docs/reference/constants.rst
+++ b/pdns/dnsdistdist/docs/reference/constants.rst
@@ -95,9 +95,9 @@ DNSResponseAction
 
 These constants represent an Action that can be returned from the functions invoked by :func:`addLuaResponseAction`.
 
- * ``DNSResponseAction.Allow``: let the query pass, skipping other rules
+ * ``DNSResponseAction.Allow``: let the response pass, skipping other rules
  * ``DNSResponseAction.Delay``: delay the response for the specified milliseconds (UDP-only), continue to the next rule
- * ``DNSResponseAction.Drop``: drop the query
+ * ``DNSResponseAction.Drop``: drop the response
  * ``DNSResponseAction.HeaderModify``: indicate that the query has been turned into a response
  * ``DNSResponseAction.None``: continue to the next rule
  * ``DNSResponseAction.ServFail``: return a response with a ServFail rcode
diff --git a/pdns/dnsdistdist/docs/rules-actions.rst b/pdns/dnsdistdist/docs/rules-actions.rst
index d05f0b6009..878645b0d6 100644
--- a/pdns/dnsdistdist/docs/rules-actions.rst
+++ b/pdns/dnsdistdist/docs/rules-actions.rst
@@ -152,7 +152,7 @@ Rule Generators
   This function works similar to using :func:`LuaAction`.
   The ``function`` should return both a :ref:`DNSAction` and its argument `rule`. The `rule` is used as an argument
   of the following :ref:`DNSAction`: `DNSAction.Spoof`, `DNSAction.Pool` and `DNSAction.Delay`. As of version `1.3.0`, you can
-  ommit the argument. For earlier releases, simply return an empty string. If the Lua code fails, ServFail is returned.
+  omit the argument. For earlier releases, simply return an empty string. If the Lua code fails, ServFail is returned.
 
   :param DNSRule: match queries based on this rule
   :param string function: the name of a Lua function
@@ -165,7 +165,7 @@ Rule Generators
   ::
 
     function luarule(dq)
-      if(dq.qtype==35) -- NAPTR
+      if(dq.qtype==dnsdist.NAPTR)
       then
         return DNSAction.Pool, "abuse" -- send to abuse pool
       else
@@ -184,7 +184,7 @@ Rule Generators
   Invoke a Lua function that accepts a :class:`DNSResponse`.
   This function works similar to using :func:`LuaResponseAction`.
   The ``function`` should return both a :ref:`DNSResponseAction` and its argument `rule`. The `rule` is used as an argument
-  of the `DNSResponseAction.Delay`. As of version `1.3.0`, you can ommit the argument (see :func:`addLuaAction`). For earlier
+  of the `DNSResponseAction.Delay`. As of version `1.3.0`, you can omit the argument (see :func:`addLuaAction`). For earlier
   releases, simply return an empty string. If the Lua code fails, ServFail is returned.
 
   :param DNSRule: match queries based on this rule
diff --git a/regression-tests.dnsdist/test_Advanced.py b/regression-tests.dnsdist/test_Advanced.py
index 589f4e0552..c4ab74103d 100644
--- a/regression-tests.dnsdist/test_Advanced.py
+++ b/regression-tests.dnsdist/test_Advanced.py
@@ -1293,7 +1293,7 @@ class TestAdvancedLuaActionReturnSyntax(DNSDistTest):
         """
         Advanced: Short syntax for LuaAction return values
         """
-        name = 'refused.advanced.tests.powerdns.com.'
+        name = 'short.refused.advanced.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN')
         response = dns.message.make_response(query)
         rrset = dns.rrset.from_text(name,