diff options
author | Thomas Markwalder <tmark@isc.org> | 2018-01-05 07:07:49 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2018-01-05 07:09:05 -0500 |
commit | a804fcc04a6189f241de9e811d527c7eafed219e (patch) | |
tree | d67a65167f13327a75ed8936dccb20b815ad0c9e /client | |
parent | d8805cee563c2f124a34ebea25642dd4c695a9fe (diff) | |
download | isc-dhcp-a804fcc04a6189f241de9e811d527c7eafed219e.tar.gz |
[master] Added backward incompatibility warnings to RELNOTES
Merges in rt23252a.
Diffstat (limited to 'client')
-rw-r--r-- | client/dhclient.8 | 12 | ||||
-rw-r--r-- | client/dhclient.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/client/dhclient.8 b/client/dhclient.8 index 1fe1f801..ebc750f7 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 @@ -1,6 +1,6 @@ .\" $Id: dhclient.8,v 1.36 2011/04/15 21:58:12 sar Exp $ .\" -.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium .\" .\" This Source Code Form is subject to the terms of the Mozilla Public @@ -363,7 +363,7 @@ Use a DUID with DHCPv4 clients. If no DUID is available in the lease file one will be constructed and saved. The DUID will be used to construct a RFC4361 style client id that will be included in the client's messages. This client id can be overridden by -setting a client id in the configuration file. Overridding the +setting a client id in the configuration file. Overriding the client id in this fashion is discouraged. .TP .BI \-I @@ -429,6 +429,14 @@ Restore normal address query for IPv6. This implies \fB-6\fR. It is used to restore normal operation after using \fB-T\fR or \fB-P\fR. Multiple addresses can be requested with multiple \fB\-N\fR flags. .TP +.BI \--address-prefix-len \ length +Specify the length of the prefix for IPv6 addresses. This value is passed by +dhclient into the client script via the environment variable, ip6_prefixlen, +when binding IPv6 addresses. The default value is 128. Alternatively you may +change the default at compile time by setting DHCLIENT_DEFAULT_PREFIX_LEN in +includes/site.h. +.PP +.TP .BI \--dad-wait-time \ seconds Specify maximum time (in seconds) that the client should wait for the duplicate address detection (DAD) to complete on an interface. This diff --git a/client/dhclient.c b/client/dhclient.c index 9435b2f9..ac3cdbf8 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -165,13 +165,13 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; "[-4|-6] [-SNTPRI1dvrxi] [-nw] -4o6 <port>] [-p <port>] [-D LL|LLT]\n" \ " [--dad-wait-time <seconds>] [--prefix-len-hint <length>]\n" \ " [--decline-wait-time <seconds>]\n" \ -" [--address-prefix-len length]\n" +" [--address-prefix-len <length>]\n" #else /* DHCP4o6 */ #define DHCLIENT_USAGE0 \ "[-4|-6] [-SNTPRI1dvrxi] [-nw] [-p <port>] [-D LL|LLT]\n" \ " [--dad-wait-time <seconds>] [--prefix-len-hint <length>]\n" \ " [--decline-wait-time <seconds>]\n" \ -" [--address-prefix-len length]\n" +" [--address-prefix-len <length>]\n" #endif #else /* DHCPv6 */ #define DHCLIENT_USAGE0 \ |