mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-28 12:57:42 +00:00
Code Issues Releases Wiki Activity

- A double-dereference in dhclient transmission of DHCPDECLINEs was

Browse Source 
repaired. [ISC-Bugs #18097]
This commit is contained in:
David Hankins 2008-06-11 20:17:10 +00:00
parent 420d8b3f0c
commit 40ec5f3863
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README
View File

@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution Internet Systems Consortium DHCP Distribution
Version 4.1.0a1 Version 4.1.0a2
24 January 2008 4 June 2008
README FILE README FILE
@ -129,12 +129,12 @@ information. On Digital Unix, type ``man pfilt''.
To build the DHCP Distribution, unpack the compressed tar file using To build the DHCP Distribution, unpack the compressed tar file using
the tar utility and the gzip command - type something like: the tar utility and the gzip command - type something like:
gunzip dhcp-4.1.0a1.tar.gz gunzip dhcp-4.1.0a2.tar.gz
tar xvf dhcp-4.1.0a1.tar tar xvf dhcp-4.1.0a2.tar
CONFIGURING IT CONFIGURING IT
Now, cd to the dhcp-4.1.0a1 subdirectory that you've just created and Now, cd to the dhcp-4.1.0a2 subdirectory that you've just created and
configure the source tree by typing: configure the source tree by typing:
./configure ./configure

7
RELNOTES
View File

@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution Internet Systems Consortium DHCP Distribution
Version 4.1.0a1 Version 4.1.0a2
24 January 2008 4 June 2008
Release Notes Release Notes
@ -86,6 +86,9 @@ work on other platforms. Please report any problems and suggested fixes to
- Integrated client with stateless, temporary address and prefix delegation - Integrated client with stateless, temporary address and prefix delegation
support. support.
- A double-dereference in dhclient transmission of DHCPDECLINEs was
repaired.
Changes since 4.0.0 (new features) Changes since 4.0.0 (new features)
- Added DHCPv6 rapid commit support. - Added DHCPv6 rapid commit support.

7
client/dhclient.c
View File

@ -2432,12 +2432,13 @@ void make_decline (client, lease)
struct option_state *options = (struct option_state *)0; struct option_state *options = (struct option_state *)0;
/* Create the options cache. */
oc = lookup_option (&dhcp_universe, lease -> options, oc = lookup_option (&dhcp_universe, lease -> options,
DHO_DHCP_SERVER_IDENTIFIER); DHO_DHCP_SERVER_IDENTIFIER);
make_client_options(client, lease, &decline, oc, &lease->address, make_client_options(client, lease, &decline, oc, &lease->address,
NULL, &options); NULL, &options);
/* Set up the option buffer... */ /* Consume the options cache into the option buffer. */
memset (&client -> packet, 0, sizeof (client -> packet)); memset (&client -> packet, 0, sizeof (client -> packet));
client -> packet_length = client -> packet_length =
cons_options ((struct packet *)0, &client -> packet, cons_options ((struct packet *)0, &client -> packet,
@ -2445,10 +2446,12 @@ void make_decline (client, lease)
(struct option_state *)0, options, (struct option_state *)0, options,
&global_scope, 0, 0, 0, (struct data_string *)0, &global_scope, 0, 0, 0, (struct data_string *)0,
client -> config -> vendor_space_name); client -> config -> vendor_space_name);
/* Destroy the options cache. */
option_state_dereference (&options, MDL); option_state_dereference (&options, MDL);
if (client -> packet_length < BOOTP_MIN_LEN) if (client -> packet_length < BOOTP_MIN_LEN)
client -> packet_length = BOOTP_MIN_LEN; client -> packet_length = BOOTP_MIN_LEN;
option_state_dereference (&options, MDL);
client -> packet.op = BOOTREQUEST; client -> packet.op = BOOTREQUEST;
client -> packet.htype = client -> interface -> hw_address.hbuf [0]; client -> packet.htype = client -> interface -> hw_address.hbuf [0];

2
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([DHCP], [4.1.0a1], [dhcp-users@isc.org]) AC_INIT([DHCP], [4.1.0a2], [dhcp-users@isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files, # we specify "foreign" to avoid having to have the GNU mandated files,
# like AUTHORS, COPYING, and such # like AUTHORS, COPYING, and such