- A double-dereference in dhclient transmission of DHCPDECLINEs was

  repaired. [ISC-Bugs #18097]

diff --git a/README b/README
index d55ce80f1da773ed245559b15e7afcd8b33d6d96..f7dd5f7178178bd77c00c40a75a4dc4d3ca688b6 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                           Version 4.1.0a1
-                           24 January 2008
+                           Version 4.1.0a2
+                             4 June 2008
 
                              README FILE
 
@@ -129,12 +129,12 @@ information.   On Digital Unix, type ``man pfilt''.
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-       gunzip dhcp-4.1.0a1.tar.gz
-       tar xvf dhcp-4.1.0a1.tar
+       gunzip dhcp-4.1.0a2.tar.gz
+       tar xvf dhcp-4.1.0a2.tar
 
                            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

diff --git a/RELNOTES b/RELNOTES
index 7e0a67741cf536696f50ca77a072f0e4b2ee7469..7e74dbe5d242a98999733d9ea6fbf87323144115 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
              Internet Systems Consortium DHCP Distribution
-                           Version 4.1.0a1
-                           24 January 2008
+                           Version 4.1.0a2
+                             4 June 2008
 
                             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
   support.
 
+- A double-dereference in dhclient transmission of DHCPDECLINEs was
+  repaired.
+
                        Changes since 4.0.0 (new features)
 
 - Added DHCPv6 rapid commit support.

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

diff --git a/configure.ac b/configure.ac
index 9118f897a0aa41cd65825599bda3cbcb98e1c3c9..9df3c2b15b8470fb44894af5601680e562f174ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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,
 # like AUTHORS, COPYING, and such