diff -rNc2 dhcp-2.0b1pl7/README dhcp-2.0b1pl8/README
*** dhcp-2.0b1pl7/README	Tue Dec 22 15:14:28 1998
--- dhcp-2.0b1pl8/README	Wed Dec 23 06:18:43 1998
***************
*** 1,6 ****
  		     Internet Software Consortium
  	   Dynamic Host Configuration Protocol Distribution
! 		   Version 2, Beta 1, Patchlevel 7
! 			  December 22, 1998
  
  This is the first Beta release of Version 2 of the Internet Software
--- 1,6 ----
  		     Internet Software Consortium
  	   Dynamic Host Configuration Protocol Distribution
! 		   Version 2, Beta 1, Patchlevel 8
! 			  December 23, 1998
  
  This is the first Beta release of Version 2 of the Internet Software
***************
*** 47,53 ****
  the tar utility and the gzip command - type something like:
  
! 	zcat dhcp-2.0b1pl7.tar.gz |tar xvf -
  
! Now, cd to the dhcp-2.0b1pl7 subdirectory that you've just created and
  configure the source tree by typing:
  
--- 47,53 ----
  the tar utility and the gzip command - type something like:
  
! 	zcat dhcp-2.0b1pl8.tar.gz |tar xvf -
  
! Now, cd to the dhcp-2.0b1pl8 subdirectory that you've just created and
  configure the source tree by typing:
  
diff -rNc2 dhcp-2.0b1pl7/RELNOTES dhcp-2.0b1pl8/RELNOTES
*** dhcp-2.0b1pl7/RELNOTES	Tue Dec 22 15:14:26 1998
--- dhcp-2.0b1pl8/RELNOTES	Wed Dec 23 06:18:45 1998
***************
*** 1,6 ****
  		     Internet Software Consortium
  	   Dynamic Host Configuration Protocol Distribution
! 		   Version 2, Beta 1, Patchlevel 7
! 			  December 22, 1998
  
  			    Release Notes
--- 1,6 ----
  		     Internet Software Consortium
  	   Dynamic Host Configuration Protocol Distribution
! 		   Version 2, Beta 1, Patchlevel 8
! 			  December 23, 1998
  
  			    Release Notes
diff -rNc2 dhcp-2.0b1pl7/client/dhclient.c dhcp-2.0b1pl8/client/dhclient.c
*** dhcp-2.0b1pl7/client/dhclient.c	Tue Dec 22 14:38:15 1998
--- dhcp-2.0b1pl8/client/dhclient.c	Wed Dec 23 06:18:49 1998
***************
*** 57,61 ****
  #ifndef lint
  static char ocopyright[] =
! "$Id: dhclient.c,v 1.44.2.6 1998/12/22 22:38:15 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
--- 57,61 ----
  #ifndef lint
  static char ocopyright[] =
! "$Id: dhclient.c,v 1.44.2.7 1998/12/23 14:18:49 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
***************
*** 93,99 ****
  "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl7 ";
! static char contrib [] = "Please contribute if you find this software useful.";
! static char url [] = "For info: http://www.isc.org/dhcp-contrib.html";
  
  static void usage PROTO ((void));
--- 93,99 ----
  "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl8";
! 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";
  
  static void usage PROTO ((void));
diff -rNc2 dhcp-2.0b1pl7/common/dispatch.c dhcp-2.0b1pl8/common/dispatch.c
*** dhcp-2.0b1pl7/common/dispatch.c	Tue Dec 22 14:41:06 1998
--- dhcp-2.0b1pl8/common/dispatch.c	Wed Dec 23 06:14:48 1998
***************
*** 43,47 ****
  #ifndef lint
  static char copyright[] =
! "$Id: dispatch.c,v 1.47.2.5 1998/12/22 22:41:06 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
--- 43,47 ----
  #ifndef lint
  static char copyright[] =
! "$Id: dispatch.c,v 1.47.2.6 1998/12/23 14:14:48 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
***************
*** 338,342 ****
  		
  		/* Read the hardware address from this interface. */
! 		ifr = *ifp;
  		if (ioctl (sock, SIOCGIFHWADDR, &ifr) < 0)
  			continue;
--- 338,342 ----
  		
  		/* Read the hardware address from this interface. */
! 		ifr = *tmp -> ifp;
  		if (ioctl (sock, SIOCGIFHWADDR, &ifr) < 0)
  			continue;
***************
*** 371,375 ****
  		      case ARPHRD_FDDI:
  			tmp -> hw_address.hlen = 16;
! 			tmp -> hw_address.htype = ARPHRD_FDDI;
  			memcpy (tmp -> hw_address.haddr, sa.sa_data, 16);
  			break;
--- 371,375 ----
  		      case ARPHRD_FDDI:
  			tmp -> hw_address.hlen = 16;
! 			tmp -> hw_address.htype = HTYPE_FDDI; /* XXX */
  			memcpy (tmp -> hw_address.haddr, sa.sa_data, 16);
  			break;
diff -rNc2 dhcp-2.0b1pl7/relay/dhcrelay.c dhcp-2.0b1pl8/relay/dhcrelay.c
*** dhcp-2.0b1pl7/relay/dhcrelay.c	Tue Dec 22 14:56:32 1998
--- dhcp-2.0b1pl8/relay/dhcrelay.c	Wed Dec 23 06:18:52 1998
***************
*** 43,47 ****
  #ifndef lint
  static char ocopyright [] =
! "$Id: dhcrelay.c,v 1.9.2.7 1998/12/22 22:56:32 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
--- 43,47 ----
  #ifndef lint
  static char ocopyright [] =
! "$Id: dhcrelay.c,v 1.9.2.8 1998/12/23 14:18:52 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
  #endif /* not lint */
  
***************
*** 77,83 ****
  "Copyright 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl7 ";
! static char contrib [] = "Please contribute if you find this software useful.";
! static char url [] = "For info: http://www.isc.org/dhcp-contrib.html";
  
  int main (argc, argv, envp)
--- 77,83 ----
  "Copyright 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl8";
! 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";
  
  int main (argc, argv, envp)
diff -rNc2 dhcp-2.0b1pl7/server/dhcpd.c dhcp-2.0b1pl8/server/dhcpd.c
*** dhcp-2.0b1pl7/server/dhcpd.c	Tue Dec 22 14:57:05 1998
--- dhcp-2.0b1pl8/server/dhcpd.c	Wed Dec 23 06:18:47 1998
***************
*** 43,47 ****
  #ifndef lint
  static char ocopyright[] =
! "$Id: dhcpd.c,v 1.45.2.6 1998/12/22 22:57:05 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  #endif
  
--- 43,47 ----
  #ifndef lint
  static char ocopyright[] =
! "$Id: dhcpd.c,v 1.45.2.7 1998/12/23 14:18:47 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  #endif
  
***************
*** 49,55 ****
  "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl7 ";
! static char contrib [] = "Please contribute if you find this software useful.";
! static char url [] = "For info: http://www.isc.org/dhcp-contrib.html";
  
  #include "dhcpd.h"
--- 49,55 ----
  "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
  static char arr [] = "All rights reserved.";
! static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl8 ";
! 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";
  
  #include "dhcpd.h"