Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/dhcp Merge with ISC source.
details: https://anonhg.NetBSD.org/src/rev/70c98475fcac
branches: trunk
changeset: 472276:70c98475fcac
user: mellon <mellon%NetBSD.org@localhost>
date: Mon Apr 26 15:47:03 1999 +0000
description:
Merge with ISC source.
diffstat:
usr.sbin/dhcp/README | 10 +-
usr.sbin/dhcp/RELNOTES | 25 +++++++-
usr.sbin/dhcp/client/dhclient.c | 4 +-
usr.sbin/dhcp/common/dhcp-options.5 | 109 ++++++++++++++++++++++++++++++++++++
usr.sbin/dhcp/relay/dhcrelay.8 | 2 +-
usr.sbin/dhcp/server/dhcp.c | 7 +-
usr.sbin/dhcp/server/dhcpd.c | 4 +-
7 files changed, 146 insertions(+), 15 deletions(-)
diffs (277 lines):
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/README
--- a/usr.sbin/dhcp/README Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/README Mon Apr 26 15:47:03 1999 +0000
@@ -1,7 +1,7 @@
Internet Software Consortium
Dynamic Host Configuration Protocol Distribution
- Version 2, Beta 1, Patchlevel 25
- April 9, 1999
+ Version 2, Beta 1, Patchlevel 27
+ April 23, 1999
Documentation for this software includes this README file, the
RELNOTES file, and the manual pages, which are in the server, common,
@@ -86,12 +86,12 @@
To build the DHCP Distribution, unpack the compressed tar file using
the tar utility and the gzip command - type something like:
- zcat dhcp-2.0b1pl25.tar.gz |tar xvf -
+ zcat dhcp-2.0b1pl27.tar.gz |tar xvf -
On BSD/OS, you have to type gzcat, not zcat, and you may run into
similar problems on other operating systems.
-Now, cd to the dhcp-2.0b1pl25 subdirectory that you've just created and
+Now, cd to the dhcp-2.0b1pl27 subdirectory that you've just created and
configure the source tree by typing:
./configure
@@ -419,4 +419,4 @@
Vendor tags and User tags are not currently supported.
-
+These two omissions are fixed in the 3.0 release.
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/RELNOTES
--- a/usr.sbin/dhcp/RELNOTES Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/RELNOTES Mon Apr 26 15:47:03 1999 +0000
@@ -1,7 +1,7 @@
Internet Software Consortium
Dynamic Host Configuration Protocol Distribution
- Version 2, Beta 1, Patchlevel 25
- April 9, 1999
+ Version 2, Beta 1, Patchlevel 27
+ April 23, 1999
Release Notes
@@ -53,6 +53,27 @@
the near future, and is intended for sites that are in a position to
experiment, or for sites that desperately need the new features.
+ CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 26
+
+- Fix UDP/IP checksum code
+
+- Fix UDP payload length computation to prevent logging of spurious
+ errors.
+
+- Support compilation on MacOS X
+
+- Add support for some options that were added in RFC2132.
+
+ CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 25
+
+- Use the udp header's length rather than computing the length based
+ on the number of bytes received, because some broken relay agents
+ send packets with ip lengths that are longer than then sum of the ip
+ header size and the udp length.
+
+- Do path keyword substitution on unformatted manual pages before
+ installing them.
+
CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 24
- D'oh! Fix a really stupid mistake in hash.c.
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/client/dhclient.c
--- a/usr.sbin/dhcp/client/dhclient.c Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/client/dhclient.c Mon Apr 26 15:47:03 1999 +0000
@@ -56,7 +56,7 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhclient.c,v 1.21 1999/04/09 17:55:01 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dhclient.c,v 1.22 1999/04/26 15:47:03 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -95,7 +95,7 @@
static char copyright[] =
"Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl25";
+static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl27";
static char contrib [] = "Please contribute if you find this software useful.";
static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html";;
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/common/dhcp-options.5
--- a/usr.sbin/dhcp/common/dhcp-options.5 Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/common/dhcp-options.5 Mon Apr 26 15:47:03 1999 +0000
@@ -569,6 +569,115 @@
host declaration, so that dhcpd can find the host record by matching
against the client identifier.
.RE
+.B option \fBnisplus-domain\fR \fIstring\fR\fB;\fR
+.RS 0.25i
+.PP
+This option specifies the name of the client's NIS+ domain. The
+domain is formatted as a character string consisting of characters
+from the NVT ASCII character set.
+.RE
+.B option \fBnisplus-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...
+]\fB;\fR
+.RS 0.25i
+.PP
+This option specifies a list of IP addresses indicating NIS+ servers
+available to the client. Servers should be listed in order of
+preference.
+.RE
+.PP
+.B option \fBtftp-server-name\fR \fIstring\fR\fB;\fR
+.RS 0.25i
+.PP
+This option is used to identify a TFTP server and, if supported by the
+client, should have the same effect as the \fBserver-name\fR
+declaration. BOOTP clients are unlikely to support this option.
+Some DHCP clients will support it, and others actually require it.
+.RE
+.PP
+.B option \fBbootfile-name\fR \fIstring\fR\fB;\fR
+.RS 0.25i
+.PP
+This option is used to identify a bootstrap file. If supported by the
+client, it should have the same effect as the \fBfilename\fR
+declaration. BOOTP clients are unlikely to support this option. Some
+DHCP clients will support it, and others actually require it.
+.RE
+.PP
+.B option \fBmobile-ip-home-agent\fR \fIip-address\fR [\fB,\fR
+\fIip-address\fR... ]\fB;\fR
+.RS 0.25i
+.PP
+This option specifies a list of IP addresses indicating mobile IP
+home agents available to the client. Agents should be listed in
+order of preference, although normally there will be only one such
+agent.
+.RE
+.PP
+.B option \fBsmtp-server\fR \fIip-address\fR [\fB,\fR
+\fIip-address\fR... ]\fB;\fR
+.RS 0.25i
+.PP
+The SMTP server option specifies a list of SMTP servers available to
+the client. Servers should be listed in order of preference.
+.RE
+.PP
+.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.
+.RE
+.PP
+.B option \fBnntp-server\fR \fIip-address\fR [\fB,\fR
+\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.
+.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 available to the
+client. Servers should be listed in order of preference.
+.RE
+.PP
+.B option \fBfinger-server\fR \fIip-address\fR [\fB,\fR
+\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.
+.RE
+.PP
+.B option \fBirc-server\fR \fIip-address\fR [\fB,\fR
+\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.
+.RE
+.PP
+.B option \fBstreettalk-server\fR \fIip-address\fR [\fB,\fR
+\fIip-address\fR... ]\fB;\fR
+.RS 0.25i
+.PP
+The StreetTalk server option specifies a list of StreetTalk servers
+available to the client. Servers should be listed in order of
+preference.
+.RE
+.PP
+.B option \fBstreetalk-directory-assistance-server\fR \fIip-address\fR [\fB,\fR
+\fIip-address\fR... ]\fB;\fR
+.RS 0.25i
+.PP
+The StreetTalk Directory Assistance (STDA) server option specifies a
+list of STDA servers available to the client. Servers should be
+listed in order of preference.
+.RE
.SH SEE ALSO
dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcpd(8),
dhclient(8), RFC2132, RFC2131.
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/relay/dhcrelay.8
--- a/usr.sbin/dhcp/relay/dhcrelay.8 Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/relay/dhcrelay.8 Mon Apr 26 15:47:03 1999 +0000
@@ -66,7 +66,7 @@
.SH DESCRIPTION
The Internet Software Consortium DHCP Relay Agent, dhcrelay, provides a
means for relaying DHCP and BOOTP requests from a subnet to which
-no DHCP server is directly to one or more DHCP servers on other
+no DHCP server is directly connected to one or more DHCP servers on other
subnets.
.SH SYSTEM REQUIREMENTS
You must have the Berkeley
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/server/dhcp.c
--- a/usr.sbin/dhcp/server/dhcp.c Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/server/dhcp.c Mon Apr 26 15:47:03 1999 +0000
@@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
-"$Id: dhcp.c,v 1.9 1999/04/09 17:55:02 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dhcp.c,v 1.10 1999/04/26 15:47:03 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -268,7 +268,8 @@
if (!packet -> shared_network ||
(packet -> raw -> ciaddr.s_addr &&
packet -> raw -> giaddr.s_addr) ||
- packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len) {
+ (packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len &&
+ !packet -> raw -> ciaddr.s_addr)) {
/* If we don't know where it came from but we do know
where it claims to have come from, it didn't come
@@ -1471,7 +1472,7 @@
: piaddr (cip)),
piaddr (cip));
warn ("from the dynamic address pool for %s",
- ip_lease -> subnet -> shared_network -> name);
+ share -> name);
if (fixed_lease)
ip_lease = (struct lease *)0;
strcpy (dhcp_message,
diff -r a8538494052f -r 70c98475fcac usr.sbin/dhcp/server/dhcpd.c
--- a/usr.sbin/dhcp/server/dhcpd.c Mon Apr 26 15:43:06 1999 +0000
+++ b/usr.sbin/dhcp/server/dhcpd.c Mon Apr 26 15:47:03 1999 +0000
@@ -42,13 +42,13 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhcpd.c,v 1.12 1999/04/09 17:55:02 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.13 1999/04/26 15:47:04 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
#endif
static char copyright[] =
"Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl25";
+static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl27";
static char contrib [] = "Please contribute if you find this software useful.";
static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html";;
Home |
Main Index |
Thread Index |
Old Index