From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 18 Jul 2019 11:56:32 +0000 (+0200)
Subject: [#644,!370] Manual apply of e738ffc4f6713791dddcf2ae139b906bc9a4ba9d
X-Git-Tag: Kea-1.6.1~10^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81772e6937a76d2a668a4d97c44c777135878479;p=thirdparty%2Fkea.git

[#644,!370] Manual apply of e738ffc4f6713791dddcf2ae139b906bc9a4ba9d
---

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 771911bafa..e186ddce61 100644
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -183,6 +183,17 @@ quotes around them.) ``renew-timer`` and ``rebind-timer`` are values
 (also in seconds) that define T1 and T2 timers that govern when the
 client will begin the renewal and rebind procedures.
 
+.. note::
+
+   From Kea 1.6.0 the lease valid lifetime is extended from a
+   single value to a triplet with minimum, default and maximum values using
+   ``min-valid-lifetime``, ``valid-lifetime`` and
+   ``max-valid-lifetime``. When the client does not specify
+   a lifetime the default value is used, when it specifies using a DHCP option
+   code 51 this value is used if it is not lesser than the  minimum (in this case
+   the minimum is returned) or greater than the maximum (in this case the
+   maximum is used).
+
 .. note::
 
    Both ``renew-timer`` and ``rebind-timer``
diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 81dc1e5125..7e5f1a70c8 100644
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2037,6 +2037,29 @@ lease time, respectively. Kea can be configured to send values that are
 specified explicitly or that are calculated as percentages of the
 preferred lease time. The server's behavior is governed by a combination
 of configuration parameters, two of which have already been mentioned.
+
+From Kea 1.6.0 lease preferred and valid lifetime are extended from
+single values to triplets with minimum, default and maximum values using:
+
+
+- ``min-preferred-lifetime`` - specifies the minimal preferred lifetime (optional).
+
+- ``preferred-lifetime`` - specifies the default preferred lifetime.
+
+- ``max-preferred-lifetime`` - specifies the maximal preferred lifetime (optional).
+
+- ``min-valid-lifetime`` - specifies the minimal valid lifetime (optional).
+
+- ``valid-lifetime`` - specifies the default valid lifetime.
+
+- ``max-valid-lifetime`` - specifies the maximal valid lifetime (optional).
+
+When the client does not specify lifetimes the default is used. When
+it specifies a lifetime using IAADDR or IAPREFIX sub option with not
+zero values these values are used when they are between configured
+minimal (lower values are round up) and maximal (larger values are
+round down) bounds.
+
 To send specific, fixed values use the following two parameters:
 
 -  ``renew-timer`` - specifies the value of T1 in seconds.