diff -rNc2 dhcp-2.0b1pl5/RELNOTES dhcp-2.0b1pl6/RELNOTES
*** dhcp-2.0b1pl5/RELNOTES	Fri Jun 26 11:25:01 1998
--- dhcp-2.0b1pl6/RELNOTES	Fri Jun 26 14:09:45 1998
***************
*** 1,5 ****
  		     Internet Software Consortium
  	   Dynamic Host Configuration Protocol Distribution
! 		   Version 2, Beta 1, Patchlevel 4
  			    June 26, 1998
  
--- 1,5 ----
  		     Internet Software Consortium
  	   Dynamic Host Configuration Protocol Distribution
! 		   Version 2, Beta 1, Patchlevel 6
  			    June 26, 1998
  
***************
*** 46,49 ****
--- 46,59 ----
  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 5
+ 
+ - Define some extra DLPI support flags that make DLPI work much better
+   on Solaris.
+ 
+ - Fix inet_aton prototype/declaration to match Internet Software
+   Consortium BIND distribution.
+ 
+ - Document new server-identifier functionality.
  
  	      CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 4
diff -rNc2 dhcp-2.0b1pl5/common/inet_addr.c dhcp-2.0b1pl6/common/inet_addr.c
*** dhcp-2.0b1pl5/common/inet_addr.c	Sat Mar 29 02:37:51 1997
--- dhcp-2.0b1pl6/common/inet_addr.c	Fri Jun 26 13:51:35 1998
***************
*** 44,48 ****
  #ifndef lint
  static char copyright[] =
! "$Id: inet_addr.c,v 1.2 1997/03/29 10:37:51 mellon Exp $ Copyright (c) 1983, 1990, 1993 The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
  
--- 44,48 ----
  #ifndef lint
  static char copyright[] =
! "$Id: inet_addr.c,v 1.2.2.1 1998/06/26 20:51:35 mellon Exp $ Copyright (c) 1983, 1990, 1993 The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
  
***************
*** 59,63 ****
  int
  inet_aton(cp, addr)
! 	char *cp;
  	struct in_addr *addr;
  {
--- 59,63 ----
  int
  inet_aton(cp, addr)
! 	const char *cp;
  	struct in_addr *addr;
  {
diff -rNc2 dhcp-2.0b1pl5/includes/cf/sunos5-5.h dhcp-2.0b1pl6/includes/cf/sunos5-5.h
*** dhcp-2.0b1pl5/includes/cf/sunos5-5.h	Fri Jun 26 11:20:10 1998
--- dhcp-2.0b1pl6/includes/cf/sunos5-5.h	Fri Jun 26 13:50:41 1998
***************
*** 123,126 ****
--- 123,128 ----
  #if defined (USE_DEFAULT_NETWORK)
  # define USE_DLPI
+ # define USE_DLPI_RAW
+ # define USE_DLPI_PFMOD
  #endif
  
diff -rNc2 dhcp-2.0b1pl5/includes/dhcpd.h dhcp-2.0b1pl6/includes/dhcpd.h
*** dhcp-2.0b1pl5/includes/dhcpd.h	Fri Jun 26 11:19:51 1998
--- dhcp-2.0b1pl6/includes/dhcpd.h	Fri Jun 26 13:51:00 1998
***************
*** 939,943 ****
  /* inet_addr.c */
  #ifdef NEED_INET_ATON
! int inet_aton PROTO ((char *, struct in_addr *));
  #endif
  
--- 939,943 ----
  /* inet_addr.c */
  #ifdef NEED_INET_ATON
! int inet_aton PROTO ((const char *, struct in_addr *));
  #endif
  
diff -rNc2 dhcp-2.0b1pl5/server/dhcpd.c dhcp-2.0b1pl6/server/dhcpd.c
*** dhcp-2.0b1pl5/server/dhcpd.c	Sat Dec  6 03:25:32 1997
--- dhcp-2.0b1pl6/server/dhcpd.c	Fri Jun 26 14:11:01 1998
***************
*** 4,8 ****
  
  /*
!  * Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
   * All rights reserved.
   *
--- 4,8 ----
  
  /*
!  * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
   * All rights reserved.
   *
***************
*** 43,53 ****
  #ifndef lint
  static char ocopyright[] =
! "$Id: dhcpd.c,v 1.45.2.1 1997/12/06 11:25:32 mellon Exp $ Copyright 1995, 1996 The Internet Software Consortium.";
  #endif
  
  static char copyright[] =
! "Copyright 1995, 1996 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCPD $Name: V2-BETA-1-PATCH-5 $";
  
  #include "dhcpd.h"
--- 43,53 ----
  #ifndef lint
  static char ocopyright[] =
! "$Id: dhcpd.c,v 1.45.2.2 1998/06/26 21:11:01 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  #endif
  
  static char copyright[] =
! "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCPD $Name: V2-BETA-1-PATCHLEVEL-6 $";
  
  #include "dhcpd.h"
diff -rNc2 dhcp-2.0b1pl5/server/dhcpd.conf.5 dhcp-2.0b1pl6/server/dhcpd.conf.5
*** dhcp-2.0b1pl5/server/dhcpd.conf.5	Fri Nov 21 16:31:56 1997
--- dhcp-2.0b1pl6/server/dhcpd.conf.5	Fri Jun 26 14:07:11 1998
***************
*** 508,516 ****
  only the
  .B ethernet
- type is recognized, although support for
- .B token-ring
  and
  .B fddi
! hardware types would also be desirable.
  The
  .I hardware-address
--- 508,516 ----
  only the
  .B ethernet
  and
+ .B token-ring
+ types are recognized, although support for a
  .B fddi
! hardware type (and others) would also be desirable.
  The
  .I hardware-address
***************
*** 669,674 ****
   \fBserver-identifier \fIhostname\fR\fB;\fR
  .PP
! The server-identifier statement is now obsolete and is ignored by
! the DHCP server.
  .SH REFERENCE: OPTION STATEMENTS
  .PP
--- 669,685 ----
   \fBserver-identifier \fIhostname\fR\fB;\fR
  .PP
! The server-identifier statement can be used to define the value that
! is sent in the DHCP Server Identifier option for a given scope.   The
! value specified \fBmust\fR be an IP address for the DHCP server, and
! must be reachable by all clients served by a particular scope.
! .PP
! The use of the server-identifier statement is not recommended - the only
! reason to use it is to force a value other than the default value to be
! sent on occasions where the default value would be incorrect.   The default
! value is the first IP address associated with the physical network interface
! on which the request arrived.   The usual case where the
! \fIserver-identifier\fR statement needs to be sent is when a physical
! interface has more than one IP address, and the one being sent by default
! isn't appropriate for some or all clients served by that interface.
  .SH REFERENCE: OPTION STATEMENTS
  .PP