From 46050c08041a49a0a7b3d3b8943c8d381a52e6ac Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 3 Jul 2000 18:44:09 +0000
Subject: [PATCH] Import Patchlevel 2 of the ISC 2.0 dhcp client.

---
 contrib/isc-dhcp/README             | 8 ++++----
 contrib/isc-dhcp/RELNOTES           | 9 +++++++--
 contrib/isc-dhcp/includes/version.h | 2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/contrib/isc-dhcp/README b/contrib/isc-dhcp/README
index 2c053a825ac..03f308f9103 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 1</H4></C>
-<C><H4>June 24, 2000</H4></C>
+<C><H4>Version 2 Patchlevel 2</H4></C>
+<C><H4>June 30, 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.0pl1.tar.gz |tar xvf -
+	zcat dhcp-2.0pl2.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.0pl1 subdirectory that you've just created and
+<P>Now, cd to the dhcp-2.0pl2 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 3e9c1e6482c..7e7a5c3c81e 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 1
-			    June 24, 2000
+			Version 2 Patchlevel 2
+			    June 30, 2000
 
 			    Release Notes
 
@@ -22,6 +22,11 @@ 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 1
+
+- Fix a case where an unitialized pointer could result from an exceptional
+  case in DHCPRELEASE and cause a core dump.
+
 		       CHANGES FROM VERSION 2.0
 
 - Clean up DHCPRELEASE support.
diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h
index 6d520fce21a..ccda68fa161 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.0pl1"
+#define DHCP_VERSION	"2.0pl2"