dnsdist: Document that `SetDisableECSAction` doesn't remove existing values

And document a possible work-around.

diff --git a/pdns/dnsdistdist/dnsdist-actions-definitions.yml b/pdns/dnsdistdist/dnsdist-actions-definitions.yml
index ab66dde80b04e8dad188490fd1d8f5850134d507..b7fe49e7b2fce358d88db119e41b6973eb641189 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-actions-definitions.yml
+++ b/pdns/dnsdistdist/dnsdist-actions-definitions.yml
@@ -309,7 +309,7 @@ are processed after this action"
       type: "String"
       description: "The value"
 - name: "SetDisableECS"
-  description: "Disable the sending of ECS to the backend. Subsequent rules are processed after this action"
+  description: "Disable the sending of ECS to the backend. This does not remove any existing EDNS Client Subnet value sent by the client, please have a look at :ref:`yaml-settings-SetEDNSOptionAction` instead. Subsequent rules are processed after this action"
 - name: "SetDisableValidation"
   description: "Set the CD bit in the query and let it go through. Subsequent rules are processed after this action"
 - name: "SetECS"

diff --git a/pdns/dnsdistdist/docs/reference/actions.rst b/pdns/dnsdistdist/docs/reference/actions.rst
index f542959ed2be58ecd8ec758ddd191f9f8788f5ea..6ad2bb6d49643958474d8e0249ba667a05972682 100644 (file)
--- a/pdns/dnsdistdist/docs/reference/actions.rst
+++ b/pdns/dnsdistdist/docs/reference/actions.rst
@@ -535,7 +535,8 @@ The following actions exist.
 
   .. versionadded:: 1.6.0
 
-  Disable the sending of ECS to the backend.
+  Disable the addition of EDNS Client Subnet information by :program:`dnsdist` before passing queries to the backend.
+  This does not remove any existing EDNS Client Subnet value sent by the client, please have a look at :func:`SetEDNSOptionAction` instead.
   Subsequent rules are processed after this action.
   Note that this function was called :func:`DisableECSAction` before 1.6.0.
 

diff --git a/pdns/dnsdistdist/docs/reference/yaml-actions.rst b/pdns/dnsdistdist/docs/reference/yaml-actions.rst
index 4d76a602c6455b04d526721d5faae2e1adc80aff..c7349d9eab91c78d0f8331e760c9b94beaa64750 100644 (file)
--- a/pdns/dnsdistdist/docs/reference/yaml-actions.rst
+++ b/pdns/dnsdistdist/docs/reference/yaml-actions.rst
@@ -348,7 +348,7 @@ Parameters:
 SetDisableECSAction
 -------------------
 
-Disable the sending of ECS to the backend. Subsequent rules are processed after this action
+Disable the sending of ECS to the backend. This does not remove any existing EDNS Client Subnet value sent by the client, please have a look at :ref:`yaml-settings-SetEDNSOptionAction` instead. Subsequent rules are processed after this action
 
 Lua equivalent: :func:`SetDisableECSAction`