From 98311e4ba99c21b71079481caccdd5a977f22c78 Mon Sep 17 00:00:00 2001 From: David Hankins Date: Thu, 17 Mar 2005 20:15:29 +0000 Subject: MASSIVE merge from V3-RELEASE-BRANCH into HEAD. HEAD and V3-RELEASE are now synced as of tag V3-0-3-BETA-1. --- common/dhcp-options.5 | 106 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'common/dhcp-options.5') diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 index 22470bdb..25c003b3 100644 --- a/common/dhcp-options.5 +++ b/common/dhcp-options.5 @@ -1,41 +1,34 @@ -.\" dhcp-options.5 +.\" $Id: dhcp-options.5,v 1.24 2005/03/17 20:14:57 dhankins Exp $ .\" -.\" Copyright (c) 1996-2001 Internet Software Consortium. -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: +.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 1996-2003 by Internet Software Consortium .\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of The Internet Software Consortium nor the names -.\" of its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. .\" -.\" THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND -.\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -.\" DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR -.\" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" This software has been written for the Internet Software Consortium +.\" Internet Systems Consortium, Inc. +.\" 950 Charter Street +.\" Redwood City, CA 94063 +.\" +.\" http://www.isc.org/ +.\" +.\" This software has been written for Internet Systems Consortium .\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -.\" To learn more about the Internet Software Consortium, see +.\" To learn more about Internet Systems Consortium, see .\" ``http://www.isc.org/''. To learn more about Vixie Enterprises, .\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see .\" ``http://www.nominum.com''. .\" -.\" $Id: dhcp-options.5,v 1.23 2002/06/10 00:07:41 murray Exp $ +.\" $Id: dhcp-options.5,v 1.24 2005/03/17 20:14:57 dhankins Exp $ .\" .TH dhcpd-options 5 .SH NAME @@ -221,7 +214,7 @@ sending TCP segments. The minimum value is 1. .B option \fBdhcp-client-identifier\fR \fIstring\fR\fB;\fR .RS 0.25i .PP -This option can be used to specify the a DHCP client identifier in a +This option can be used to specify a DHCP client identifier in a host declaration, so that dhcpd can find the host record by matching against the client identifier. .PP @@ -247,7 +240,7 @@ server reply (DHCPOFFER), a DHCP server uses this option to specify the lease time it is willing to offer. .PP This option is not directly user configurable in the server; refer to the -\fImax-lease-time\fR and \fidefault-lease-time\fR server options in +\fImax-lease-time\fR and \fIdefault-lease-time\fR server options in .B dhcpd.conf(5). .RE .PP @@ -411,8 +404,8 @@ RFC2132. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The Finger server option specifies a list of Finger available to the -client. Servers should be listed in order of preference. +The Finger server option specifies a list of Finger servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBfont-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... @@ -481,8 +474,8 @@ forwarding, and a value of true means enable IP forwarding. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The IRC server option specifies a list of IRC available to the -client. Servers should be listed in order of preference. +The IRC server option specifies a list of IRC servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBlog-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... @@ -589,7 +582,7 @@ Possible node types are: B-node: Broadcast - no WINS .TP .I 2 -P-node: Peer - WINS only. +P-node: Peer - WINS only .TP .I 4 M-node: Mixed - broadcast, then WINS @@ -644,8 +637,8 @@ preference. \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The NNTP server option specifies a list of NNTP available to the -client. Servers should be listed in order of preference. +The NNTP server option specifies a list of NNTP servesr available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBnon-local-source-routing\fR \fIflag\fR\fB;\fR @@ -729,8 +722,8 @@ See STD 3 (RFC1122) for further information. .B option \fBpop-server\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... ]\fB;\fR .RS 0.25i .PP -The POP3 server option specifies a list of POP3 available to the -client. Servers should be listed in order of preference. +The POP3 server option specifies a list of POP3 servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBresource-location-servers\fR \fIip-address\fR @@ -901,8 +894,8 @@ This specifies the IP address of the client's swap server. .B option \fBtcp-keepalive-garbage\fR \fIflag\fR\fB;\fR .RS 0.25i .PP -This option specifies the whether or not the client should send TCP -keepalive messages with a octet of garbage for compatibility with +This option specifies whether or not the client should send TCP +keepalive messages with an octet of garbage for compatibility with older implementations. A value of false indicates that a garbage octet should not be sent. A value of true indicates that a garbage octet should be sent. @@ -982,12 +975,12 @@ this identifier, usually as a text string. This option is used by some DHCP clients to identify the vendor type and possibly the configuration of a DHCP client. The information is a string of bytes whose contents are specific to the vendor and are -not specified in a standard. To see what vendor class identifier a +not specified in a standard. To see what vendor class identifier clients are sending, you can write the following in your DHCP server configuration file: .nf .PP -set vendor-class option vendor-class-identifier; +set vendor-string = option vendor-class-identifier; .fi .PP This will result in all entries in the DHCP server lease database file @@ -995,14 +988,14 @@ for clients that sent vendor-class-identifier options having a set statement that looks something like this: .nf .PP -set vendor-class "SUNW.Ultra-5_10"; +set vendor-string = "SUNW.Ultra-5_10"; .fi .PP The vendor-class-identifier option is normally used by the DHCP server to determine the options that are returned in the .B vendor-encapsulated-options -option. Please see the VENDOR ENCAPSULATED OPTIONS section of the -dhcpd.conf manual page for further information. +option. Please see the VENDOR ENCAPSULATED OPTIONS section later in this +manual page for further information. .RE .PP .B option \fBvendor-encapsulated-options\fR \fIstring\fR\fB;\fR @@ -1019,8 +1012,15 @@ that basis. Some default behaviours for well-known DHCP client vendors (currently, the Microsoft Windows 2000 DHCP client) are configured automatically, but otherwise this must be configured manually - see the VENDOR -ENCAPSULATED OPTIONS section of the \fIdhcpd.conf\fI manual page for -details. +ENCAPSULATED OPTIONS section later in this manual page for details. +.RE +.PP +.B option \fBwww-server\fR \fIip-address\fR [\fB,\fR +\fIip-address\fR... ]\fB;\fR +.RS 0.25i +.PP +The WWW server option specifies a list of WWW servers available +to the client. Servers should be listed in order of preference. .RE .PP .B option \fBwww-server\fR \fIip-address\fR [\fB,\fR @@ -1223,7 +1223,7 @@ utility uses this value as Primary DSS server when configuring a secondary DSS server. .RE .SH DEFINING NEW OPTIONS -The Internet Software Consortium DHCP client and server provide the +The Internet Systems Consortium DHCP client and server provide the capability to define new options. Each DHCP option has a name, a code, and a structure. The name is used by you to refer to the option. The code is a number, used by the DHCP server and client to @@ -1519,8 +1519,8 @@ option. dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcp-eval(5), dhcpd(8), dhclient(8), RFC2132, RFC2131, draft-ietf-dhc-agent-options-??.txt. .SH AUTHOR -The Internet Software Consortium DHCP Distribution was written by Ted +The Internet Systems Consortium DHCP Distribution was written by Ted Lemon under a contract with Vixie Labs. Funding for -this project was provided through the Internet Software Consortium. -Information about the Internet Software Consortium can be found at +this project was provided through Internet Systems Consortium. +Information about Internet Systems Consortium can be found at .B http://www.isc.org. -- cgit v1.2.1