aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-11-04 19:57:10 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-11-04 19:57:10 +0000
commit33abda25acceba8682b4be475aa024ffee98318a (patch)
tree40baf8a1e2cf2d0bfdf47040eb8a088a49140e7e
parent3b5006fdf40103622fe256bf450329ce5e249014 (diff)
downloadsrc-33abda25acceba8682b4be475aa024ffee98318a.tar.gz
src-33abda25acceba8682b4be475aa024ffee98318a.zip
Import Patchlevel 5 of the ISC 2.0 dhcp client.
Notes
Notes: svn path=/vendor/isc-dhcp/dist/; revision=68320
-rw-r--r--contrib/isc-dhcp/README8
-rw-r--r--contrib/isc-dhcp/RELNOTES16
-rw-r--r--contrib/isc-dhcp/client/dhclient.c4
-rw-r--r--contrib/isc-dhcp/includes/version.h2
4 files changed, 21 insertions, 9 deletions
diff --git a/contrib/isc-dhcp/README b/contrib/isc-dhcp/README
index cf1fa6032bd6..4c444005ecb8 100644
--- a/contrib/isc-dhcp/README
+++ b/contrib/isc-dhcp/README
@@ -1,7 +1,7 @@
<C><H4>Internet Software Consortium</H4></C>
<C><H4>Dynamic Host Configuration Protocol Distribution</H4></C>
-<C><H4>Version 2 Patchlevel 3</H4></C>
-<C><H4>June 30, 2000</H4></C>
+<C><H4>Version 2 Patchlevel 5</H4></C>
+<C><H4>September 6, 2000</H4></C>
<C><H4>README FILE</H4></C>
@@ -135,13 +135,13 @@ information. On Digital Unix, type ``man pfilt''.</P>
the tar utility and the gzip command - type something like:</P>
<BLOCKQUOTE>
- zcat dhcp-2.0pl3.tar.gz |tar xvf -
+ zcat dhcp-2.0pl5.tar.gz |tar xvf -
</BLOCKQUOTE>
<P>On BSD/OS, you have to type gzcat, not zcat, and you may run into
similar problems on other operating systems.</P>
-<P>Now, cd to the dhcp-2.0pl3 subdirectory that you've just created and
+<P>Now, cd to the dhcp-2.0pl5 subdirectory that you've just created and
configure the source tree by typing:</P>
<BLOCKQUOTE>
diff --git a/contrib/isc-dhcp/RELNOTES b/contrib/isc-dhcp/RELNOTES
index 60d2958de6ec..de029af09412 100644
--- a/contrib/isc-dhcp/RELNOTES
+++ b/contrib/isc-dhcp/RELNOTES
@@ -1,7 +1,7 @@
Internet Software Consortium
Dynamic Host Configuration Protocol Distribution
- Version 2 Patchlevel 3
- July 19, 2000
+ Version 2 Patchlevel 5
+ September 6, 2000
Release Notes
@@ -22,6 +22,18 @@ the README file.
This log describes the changes that have been made in version 2.0
since June of 1997.
+ CHANGES FROM VERSION 2.0 PATCHLEVEL 4
+
+- Fix a prototype mismatch that causes compiles to fail on some architectures.
+
+- Two minor cosmetic changes to manual pages.
+
+ CHANGES FROM VERSION 2.0 PATCHLEVEL 3
+
+- Fix a bug introduced in the client in the previous patchlevel where the
+ broadcast would be set to the subnet number instead of the broadcast
+ address.
+
CHANGES FROM VERSION 2.0 PATCHLEVEL 2
- Rather than calling a client environment setup script, set the
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c
index 51737851412a..129f99ab9e45 100644
--- a/contrib/isc-dhcp/client/dhclient.c
+++ b/contrib/isc-dhcp/client/dhclient.c
@@ -56,7 +56,7 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhclient.c,v 1.44.2.45 2000/07/20 05:06:41 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dhclient.c,v 1.44.2.47 2000/09/06 20:59:09 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -2163,7 +2163,7 @@ void client_envadd (struct client_state *client,
int dhcp_option_ev_name (buf, buflen, option)
char *buf;
- unsigned buflen;
+ size_t buflen;
struct option *option;
{
int i;
diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h
index 70d3d0675177..303fbfa332be 100644
--- a/contrib/isc-dhcp/includes/version.h
+++ b/contrib/isc-dhcp/includes/version.h
@@ -1,3 +1,3 @@
/* Current version of ISC DHCP Distribution. */
-#define DHCP_VERSION "2.0pl3"
+#define DHCP_VERSION "2.0pl5"