From: Francis Dupont Date: Wed, 28 Jun 2023 14:22:01 +0000 (+0200) Subject: [#2745] Applied proposed changes X-Git-Tag: Kea-2.4.0~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68d4a6c914673b4fb7a3d094a2ba75bd9385e1c1;p=thirdparty%2Fkea.git [#2745] Applied proposed changes --- diff --git a/ChangeLog b/ChangeLog index bfe691f1dd..0d40e0d0cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2161. [doc] fdupont + Clarified how Kea treats situations where there are multiple + reservations for the same host. + (Gitlab #2745) + 2160. [doc] tomek Added clarification about RFC3046 (Relay agent option) support, with some examples how to use its content. diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst index 50aaf68842..296b9e11bd 100644 --- a/doc/sphinx/arm/dhcp4-srv.rst +++ b/doc/sphinx/arm/dhcp4-srv.rst @@ -5542,8 +5542,12 @@ If not specified, the default value is: As soon as a host reservation is found the search is stopped so when a client has two host reservations using different enabled - identifier types the first is permanently returned and the second - ignored, i.e. this is a configuration mistake. + identifier types the first is always returned and the second + ignored. In other words, this is usually a a configuration mistake. + In rare cases when having two reservations for the same host makes sense, + you can control which of those will be used by ordering the list of + identifier types in `host-reservation-identifiers`. + .. _global-reservations4: diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst index c5a76dae55..5b12ed49ff 100644 --- a/doc/sphinx/arm/dhcp6-srv.rst +++ b/doc/sphinx/arm/dhcp6-srv.rst @@ -4771,8 +4771,12 @@ If not specified, the default value is: As soon as a host reservation is found the search is stopped so when a client has two host reservations using different enabled - identifier types the first is permanently returned and the second - ignored, i.e. this is a configuration mistake. + identifier types the first is always returned and the second + ignored. In other words, this is usually a a configuration mistake. + In rare cases when having two reservations for the same host makes sense, + you can control which of those will be used by ordering the list of + identifier types in `host-reservation-identifiers`. + .. _global-reservations6: