summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2020-12-29 16:48:04 +0100
committerFrancis Dupont <fdupont@isc.org>2020-12-29 16:48:04 +0100
commit79110e525e0584d195327d31f4ee67e6a5e2fe7a (patch)
treee9f09c1e450926d0c4a06d6732827caf37f17df9
parentee3fe731fd90d64eb632284c0e237d1f3a64cd0e (diff)
downloadisc-dhcp-79110e525e0584d195327d31f4ee67e6a5e2fe7a.tar.gz
-rw-r--r--RELNOTES6
-rw-r--r--client/dhclient.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/RELNOTES b/RELNOTES
index 15867642..7ed1f37d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -105,9 +105,9 @@ by Eric Young (eay@cryptsoft.com).
Changes since 4.4.2 (New Features)
-- Added support of the new DHCPv4 option v6-only-preferred specified in
-RFC 8925. A new reason V6ONLY was added to the client script and the
-client Linux script sample was updated.
+- Added support of the new DHCPv4 option v6-only-preferred specified
+in RFC 8925. A new reason code, V6ONLY, was added to the client script
+and the client Linux script sample was updated.
[Gitlab #132]
Changes since 4.4.2 (Bug Fixes)
diff --git a/client/dhclient.c b/client/dhclient.c
index 42d098ab..0a4fa312 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -1285,7 +1285,7 @@ uint32_t check_v6only(packet, client)
if (evaluate_option_cache(&data, packet, (struct lease *)0, client,
packet->options, (struct option_state *)0,
&global_scope, oc, MDL)) {
- if (data.len > 3) {
+ if (data.len == 4) {
v6only_wait = getULong(data.data);
if (v6only_wait < MIN_V6ONLY_WAIT)
v6only_wait = MIN_V6ONLY_WAIT;
@@ -1475,7 +1475,7 @@ void dhcpack (packet)
/* Check v6only first. */
v6only_wait = check_v6only(packet, client);
if (v6only_wait > 0) {
- log_info("v6 only preferred for %lu.",
+ log_info("v6 only preferred for %lu seconds.",
(long unsigned)v6only_wait);
cancel_timeout(send_request, client);
start_v6only(client, v6only_wait);