diff options
| author | David Hankins <dhankins@isc.org> | 2010-02-17 19:59:09 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2010-02-17 19:59:09 +0000 |
| commit | 96b8a095e2fb4c3a902fd8a6c6019e777f1833f9 (patch) | |
| tree | fb4d94d4efe3795110a4b216585bba5a8f76b9b4 /common/dhcp-options.5 | |
| parent | 03211a6f82dd2881f8fe0db7efe1fda3ac686240 (diff) | |
| download | isc-dhcp-96b8a095e2fb4c3a902fd8a6c6019e777f1833f9.tar.gz | |
Pull missing changes from HEAD down to v4_2.
- When using 'ignore client-updates;', the FQDN returned to the client
is no longer truncated to one octet.
- Cleaned up an unused hardware address variable in nak_lease().
- Manpage entries for the ia-pd and ia-prefix options were updated to
reflect support for prefix delegation.
- An optimization described in the failover protocol draft is now included,
which permits a DHCP server operating in communications-interrupted state
to 'rewind' a lease to the state most recently transmitted to its peer,
greatly increasing a server's endurance in communications-interrupted.
This is supported using a new 'rewind state' record on the dhcpd.leases
entry for each lease.
Diffstat (limited to 'common/dhcp-options.5')
| -rw-r--r-- | common/dhcp-options.5 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 index bb660713..0525d5dd 100644 --- a/common/dhcp-options.5 +++ b/common/dhcp-options.5 @@ -1,4 +1,4 @@ -.\" $Id: dhcp-options.5,v 1.45.18.1 2009/11/20 01:48:59 sar Exp $ +.\" $Id: dhcp-options.5,v 1.45.18.2 2010/02/17 19:59:09 dhankins Exp $ .\" .\" Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC") .\" Copyright (c) 1996-2003 by Internet Software Consortium @@ -1546,18 +1546,18 @@ the "search" line in /etc/resolv.conf. .RS 0.25i .PP The \fBia-pd\fR option is manufactured by clients and servers to create a -Prefix Delegation binding - to delegate an IPv6 prefix to the client. There -is not yet any support for prefix delegation in this software, and this -option is provided informationally only. +Prefix Delegation binding - to delegate an IPv6 prefix to the client. It is +not directly edited in dhcpd.conf(5) or dhclient.conf(5), but rather is +manufactured and consumed by the software. .RE .PP .B option \fBdhcp6.ia-prefix\fR \fIstring\fR\fB;\fR .RS 0.25i .PP The \fBia-prefix\fR option is placed inside \fBia-pd\fR options in order -to identify the prefix(es) allocated to the client. There is not yet -any suport for prefix delegation in this software, and this option is -provided informationally only. +to identify the prefix(es) allocated to the client. It is not directly +edited in dhcpd.conf(5) or dhclient.conf(5), but rather is +manufactured and consumed by the software. .RE .PP .B option |