From 8cabdcb94c37b7f674f0084b12d935a3e7dc8b83 Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 9 Aug 2000 18:37:31 +0000 Subject: Vendor approved fix where with some CIDR subnets, dhclient would set the broadcast address to the [sub]net address. Approved by: Ted Lemon Submitted by: Ben Smithurst --- contrib/isc-dhcp/client/dhclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c index 4110ad5..5173785 100644 --- a/contrib/isc-dhcp/client/dhclient.c +++ b/contrib/isc-dhcp/client/dhclient.c @@ -1962,7 +1962,7 @@ void script_write_params (ip, prefix, lease) if (broadcast.len) { client_envadd (ip -> client, prefix, "broadcast_address", - "%s", piaddr (subnet)); + "%s", piaddr (broadcast)); } } } -- cgit v1.1 From 68ee0aeb719e4bf0f0beebcd896e4a751f32dfc3 Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 4 Nov 2000 19:57:10 +0000 Subject: Import Patchlevel 5 of the ISC 2.0 dhcp client. --- contrib/isc-dhcp/README | 8 ++++---- contrib/isc-dhcp/RELNOTES | 16 ++++++++++++++-- contrib/isc-dhcp/client/dhclient.c | 4 ++-- contrib/isc-dhcp/includes/version.h | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) (limited to 'contrib') diff --git a/contrib/isc-dhcp/README b/contrib/isc-dhcp/README index cf1fa60..4c44400 100644 --- a/contrib/isc-dhcp/README +++ b/contrib/isc-dhcp/README @@ -1,7 +1,7 @@

Internet Software Consortium

Dynamic Host Configuration Protocol Distribution

 -

Version 2 Patchlevel 3

 -

June 30, 2000

 +

Version 2 Patchlevel 5

 +

September 6, 2000

README FILE

 @@ -135,13 +135,13 @@ information. On Digital Unix, type ``man pfilt''.

the tar utility and the gzip command - type something like:

- zcat dhcp-2.0pl3.tar.gz |tar xvf - + zcat dhcp-2.0pl5.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.0pl3 subdirectory that you've just created and +

Now, cd to the dhcp-2.0pl5 subdirectory that you've just created and configure the source tree by typing:

diff --git a/contrib/isc-dhcp/RELNOTES b/contrib/isc-dhcp/RELNOTES index 60d2958..de029af 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 5173785..129f99a 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 70d3d067..303fbfa 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" -- cgit v1.1