This commit was generated by cvs2svn to compensate for changes in r44930,

which included commits to RCS files with non-trunk default branches.

2 files changed, 24 insertions, 5 deletions

diff --git a/contrib/isc-dhcp/README b/contrib/isc-dhcp/README
index cef3d38..756087f 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, Beta 1, Patchlevel 17
-			  February 27, 1998
+		   Version 2, Beta 1, Patchlevel 18
+			    March 5, 1998
 
 This is the first Beta release of Version 2 of the Internet Software
 Consortium DHCP Distribution.  In version 2.0, this distribution
@@ -47,9 +47,9 @@ 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:
 
-	zcat dhcp-2.0b1pl17.tar.gz |tar xvf -
+	zcat dhcp-2.0b1pl18.tar.gz |tar xvf -
 
-Now, cd to the dhcp-2.0b1pl17 subdirectory that you've just created and
+Now, cd to the dhcp-2.0b1pl18 subdirectory that you've just created and
 configure the source tree by typing:
 
 		./configure
diff --git a/contrib/isc-dhcp/RELNOTES b/contrib/isc-dhcp/RELNOTES
index 84d9c40..0a517d6 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, Beta 1, Patchlevel 18
-			  February 27, 1998
+			    March 5, 1998
 
 			    Release Notes
 
@@ -53,6 +53,25 @@ running in producion at the ISC, but is not expected to be stable in
 the near future, and is intended for sites that are in a position to
 experiment, or for sites that desperately need the new features.
 
+	    CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 17
+
+- Fix a bug in the relay agent where messages to the client would be
+  unicast in the IP header but broadcast in the link header.   The
+  Microsoft DHCP client would reject such packets, preventing it from
+  being configured.   This was only a problem on non-socket-API
+  platforms.
+
+- Do not attempt to reclaim requested abandoned leases in response to
+  DHCPDISCOVER messages.
+
+- Allow the maximum lease time parameter in a host declaration to
+  override the maximum lease time parameter in a subnet declaration.
+
+- Better document the -p flag for dhclient, dhcrelay and dhcpd.
+
+- Apply John Wehle's patch to fix the endianness bug in the dlpi
+  packet filter on Solaris.
+
 	    CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 16
 
 - Fix linux man page install location.