4 files changed, 38 insertions, 7 deletions

diff --git a/contrib/isc-dhcp/README b/contrib/isc-dhcp/README
index cef3d38fcfaf..756087f5ab4f 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 84d9c40be5ce..0a517d6c149f 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.
diff --git a/contrib/isc-dhcp/client/dhclient.8 b/contrib/isc-dhcp/client/dhclient.8
index 0406c49137ca..eae843776c74 100644
--- a/contrib/isc-dhcp/client/dhclient.8
+++ b/contrib/isc-dhcp/client/dhclient.8
@@ -121,6 +121,18 @@ standard (port 68), the
 .B -p
 flag may used.  It should be followed by the udp port number that
 dhclient should use.  This is mostly useful for debugging purposes.
+If the
+.B -p
+flag is specified, the client will transmit responses to servers at a
+port number that is one less than the one specified - i.e., if you
+specify
+.B -p
+68, then the client will listen on port 68 and transmit to port 67.
+Datagrams that must go through relay agents are sent to the port
+number specified with the
+.B -p
+flag - if you wish to use alternate port numbers, you must configure
+any relay agents you are using to use the same alternate port numbers.
 .PP
 Dhclient will normally run in the foreground until it has configured
 an interface, and then will revert to running in the background.
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c
index d9a1b9f2c44d..4d33f413e5d4 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.24 1999/02/27 21:51:35 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.44.2.25 1999/03/05 16:13:54 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -92,7 +92,7 @@ int save_scripts;
 static char copyright[] =
 "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
 static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl17";
+static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl18";
 static char contrib [] = "\nPlease contribute if you find this software useful.";
 static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";