From: Remi Gacogne Date: Mon, 14 Apr 2025 12:43:35 +0000 (+0200) Subject: dnsdist: Document that `SetDisableECSAction` doesn't remove existing values X-Git-Tag: dnsdist-2.0.0-alpha2~78^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15426%2Fhead;p=thirdparty%2Fpdns.git 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 ab66dde80b..b7fe49e7b2 100644 --- 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 f542959ed2..6ad2bb6d49 100644 --- 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 4d76a602c6..c7349d9eab 100644 --- 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`