diff -rc2 dhcp-2.0b1pl20/README dhcp-2.0b1pl21/README *** dhcp-2.0b1pl20/README Mon Mar 29 13:19:21 1999 --- dhcp-2.0b1pl21/README Mon Mar 29 17:45:46 1999 *************** *** 1,5 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 20 March 29, 1998 --- 1,5 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 21 March 29, 1998 *************** *** 89,95 **** the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl20.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl20 subdirectory that you've just created and configure the source tree by typing: --- 89,95 ---- the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl21.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl21 subdirectory that you've just created and configure the source tree by typing: diff -rc2 dhcp-2.0b1pl20/RELNOTES dhcp-2.0b1pl21/RELNOTES *** dhcp-2.0b1pl20/RELNOTES Mon Mar 29 14:44:38 1999 --- dhcp-2.0b1pl21/RELNOTES Mon Mar 29 17:45:34 1999 *************** *** 1,5 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 20 March 29, 1998 --- 1,5 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 21 March 29, 1998 *************** *** 53,56 **** --- 53,61 ---- 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 20 + + - Actually do the client fix mentioned below - Patchlevel 20 only contained + half of the fix. CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 19 diff -rc2 dhcp-2.0b1pl20/client/dhclient.c dhcp-2.0b1pl21/client/dhclient.c *** dhcp-2.0b1pl20/client/dhclient.c Mon Mar 29 15:13:48 1999 --- dhcp-2.0b1pl21/client/dhclient.c Mon Mar 29 17:45:47 1999 *************** *** 57,61 **** #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.29 1999/03/29 23:13:48 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 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.31 1999/03/30 01:45:47 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 93,97 **** "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.0b1pl20"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; --- 93,97 ---- "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.0b1pl21"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; *************** *** 1457,1461 **** ip -> client -> packet.xid = random (); ip -> client -> packet.secs = 0; /* filled in by send_discover. */ ! ip -> client -> packet.flags = htons (BOOTP_BROADCAST); /* XXX */ memset (&(ip -> client -> packet.ciaddr), 0, sizeof ip -> client -> packet.ciaddr); --- 1457,1466 ---- ip -> client -> packet.xid = random (); ip -> client -> packet.secs = 0; /* filled in by send_discover. */ ! ! if (can_receive_unicast_unconfigured (ip)) ! ip -> client -> packet.flags = 0; ! else ! ip -> client -> packet.flags = htons (BOOTP_BROADCAST); ! memset (&(ip -> client -> packet.ciaddr), 0, sizeof ip -> client -> packet.ciaddr); *************** *** 1576,1580 **** memset (&ip -> client -> packet.ciaddr, 0, sizeof ip -> client -> packet.ciaddr); ! ip -> client -> packet.flags = htons (BOOTP_BROADCAST); } --- 1581,1588 ---- memset (&ip -> client -> packet.ciaddr, 0, sizeof ip -> client -> packet.ciaddr); ! if (can_receive_unicast_unconfigured (ip)) ! ip -> client -> packet.flags = 0; ! else ! ip -> client -> packet.flags = htons (BOOTP_BROADCAST); } *************** *** 1665,1669 **** ip -> client -> packet.xid = ip -> client -> xid; ip -> client -> packet.secs = 0; /* Filled in by send_request. */ ! ip -> client -> packet.flags = htons (BOOTP_BROADCAST); /* ciaddr must always be zero. */ --- 1673,1677 ---- ip -> client -> packet.xid = ip -> client -> xid; ip -> client -> packet.secs = 0; /* Filled in by send_request. */ ! ip -> client -> packet.flags = 0; /* ciaddr must always be zero. */ *************** *** 1731,1736 **** ip -> client -> packet.secs = 0; ip -> client -> packet.flags = 0; ! memcpy (&ip -> client -> packet.ciaddr, ! lease -> address.iabuf, lease -> address.len); memset (&ip -> client -> packet.yiaddr, 0, sizeof ip -> client -> packet.yiaddr); --- 1739,1745 ---- ip -> client -> packet.secs = 0; ip -> client -> packet.flags = 0; ! ! memset (&ip -> client -> packet.ciaddr, 0, ! sizeof ip -> client -> packet.ciaddr); memset (&ip -> client -> packet.yiaddr, 0, sizeof ip -> client -> packet.yiaddr); diff -rc2 dhcp-2.0b1pl20/relay/dhcrelay.c dhcp-2.0b1pl21/relay/dhcrelay.c *** dhcp-2.0b1pl20/relay/dhcrelay.c Mon Mar 29 14:25:16 1999 --- dhcp-2.0b1pl21/relay/dhcrelay.c Mon Mar 29 17:45:49 1999 *************** *** 43,47 **** #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.23 1999/03/29 22:25:16 mellon Exp $ Copyright (c) 1997, 1998, 1999 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.24 1999/03/30 01:45:49 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 77,81 **** "Copyright 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl20"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; --- 77,81 ---- "Copyright 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl21"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; diff -rc2 dhcp-2.0b1pl20/server/dhcpd.c dhcp-2.0b1pl21/server/dhcpd.c *** dhcp-2.0b1pl20/server/dhcpd.c Mon Mar 29 15:13:15 1999 --- dhcp-2.0b1pl21/server/dhcpd.c Mon Mar 29 17:45:49 1999 *************** *** 43,47 **** #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.21 1999/03/29 23:13:15 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; #endif --- 43,47 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.22 1999/03/30 01:45:49 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; #endif *************** *** 49,53 **** "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl20"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; --- 49,53 ---- "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl21"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html";