summaryrefslogtreecommitdiffstats
path: root/doc/sphinx/arm/ddns.rst
diff options
context:
space:
mode:
authorSuzanne Goldlust <sgoldlust@isc.org>2021-10-21 20:50:25 +0200
committerThomas Markwalder <tmark@isc.org>2021-10-21 21:10:54 +0200
commit4df1c438c527fdb0aae951b6066a5fe5c0ff5c58 (patch)
tree1474ac2a61512ea5865e8d54136a8013eb720a8b /doc/sphinx/arm/ddns.rst
parent[#2132] Remove spacing in "NameChangeRequest" text (diff)
downloadkea-4df1c438c527fdb0aae951b6066a5fe5c0ff5c58.tar.xz
kea-4df1c438c527fdb0aae951b6066a5fe5c0ff5c58.zip
[#2132] More text edits after review
Diffstat (limited to 'doc/sphinx/arm/ddns.rst')
-rw-r--r--doc/sphinx/arm/ddns.rst12
1 files changed, 11 insertions, 1 deletions
diff --git a/doc/sphinx/arm/ddns.rst b/doc/sphinx/arm/ddns.rst
index cdea29df14..576fbe2821 100644
--- a/doc/sphinx/arm/ddns.rst
+++ b/doc/sphinx/arm/ddns.rst
@@ -74,7 +74,17 @@ In other words, the DHCID RR maps an FQDN to the client to whom it
belongs, and thereafter changes to that mapping can only be done by
or at the behest of that client.
-Currently, D2 conflict detection is always performed.
+Conflict resolution can be indirectly enabled or disabled via
+the configuration parameter ``ddns-use-conflict-resolution``, supported
+by both ``kea-dhcp4`` and ``kea-dhcp6``. The servers use this parameter to
+set a flag within each NameChangeRequest they send that tells D2
+whether conflict resolution should be employed for that request.
+By default, conflict resolution is enabled. For more details, please refer
+to discussions of ``ddns-use-conflict-resolution`` in :ref:`dhcp4-ddns-config` and :ref:`dhcp6-ddns-config`.
+
+When conflict resolution is disabled, D2 still adds DHCID RRs but does
+not use them to enforce client ownership of DNS entries. Disabling it should
+only be used after careful consideration.
.. _dhcp-ddns-dual-stack: