diff -rc2 dhcp-2.0b1pl21/README dhcp-2.0b1pl22/README *** dhcp-2.0b1pl21/README Mon Mar 29 17:45:46 1999 --- dhcp-2.0b1pl22/README Mon Mar 29 19:01:43 1999 *************** *** 1,5 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 21 March 29, 1998 --- 1,5 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 22 March 29, 1998 *************** *** 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: --- 89,95 ---- the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl22.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl22 subdirectory that you've just created and configure the source tree by typing: diff -rc2 dhcp-2.0b1pl21/RELNOTES dhcp-2.0b1pl22/RELNOTES *** dhcp-2.0b1pl21/RELNOTES Mon Mar 29 17:45:34 1999 --- dhcp-2.0b1pl22/RELNOTES Mon Mar 29 18:59:22 1999 *************** *** 1,5 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 21 March 29, 1998 --- 1,5 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 22 March 29, 1998 *************** *** 54,57 **** --- 54,62 ---- experiment, or for sites that desperately need the new features. + CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 21 + + - Fix a pasto in options.c that will cause a core dump whenever a + client sends in a request without a parameter request list. + CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 20 *************** *** 77,80 **** --- 82,91 ---- - Add -pf flag to all daemons allowing user to specify PID file name on command line. + + - Undo a previous change that attempted to be clever about testing + interface flags but wound up being stupid instead. + + - Enforce access control on DHCPREQUEST messages as well as + DHCPDISCOVER messages. CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 18 diff -rc2 dhcp-2.0b1pl21/client/dhclient.c dhcp-2.0b1pl22/client/dhclient.c *** dhcp-2.0b1pl21/client/dhclient.c Mon Mar 29 17:45:47 1999 --- dhcp-2.0b1pl22/client/dhclient.c Mon Mar 29 19:01:40 1999 *************** *** 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 */ --- 57,61 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.32 1999/03/30 03:01:40 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.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"; --- 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.0b1pl22"; 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.0b1pl21/common/options.c dhcp-2.0b1pl22/common/options.c *** dhcp-2.0b1pl21/common/options.c Mon Mar 29 15:12:55 1999 --- dhcp-2.0b1pl22/common/options.c Mon Mar 29 18:57:47 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: options.c,v 1.26.2.6 1999/03/29 23:12:55 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: options.c,v 1.26.2.7 1999/03/30 02:57:47 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 234,240 **** prl_len = (sizeof priority_list) - priority_len; ! memcpy (&priority_list [priority_len], ! (inpacket -> options ! [DHO_DHCP_PARAMETER_REQUEST_LIST].data), prl_len); priority_len += prl_len; prl = priority_list; --- 234,238 ---- prl_len = (sizeof priority_list) - priority_len; ! memcpy (&priority_list [priority_len], prl, prl_len); priority_len += prl_len; prl = priority_list; diff -rc2 dhcp-2.0b1pl21/relay/dhcrelay.c dhcp-2.0b1pl22/relay/dhcrelay.c *** dhcp-2.0b1pl21/relay/dhcrelay.c Mon Mar 29 17:45:49 1999 --- dhcp-2.0b1pl22/relay/dhcrelay.c Mon Mar 29 19:01:42 1999 *************** *** 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 */ --- 43,47 ---- #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.25 1999/03/30 03:01:42 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.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"; --- 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.0b1pl22"; 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.0b1pl21/server/dhcpd.c dhcp-2.0b1pl22/server/dhcpd.c *** dhcp-2.0b1pl21/server/dhcpd.c Mon Mar 29 17:45:49 1999 --- dhcp-2.0b1pl22/server/dhcpd.c Mon Mar 29 19:01:42 1999 *************** *** 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 --- 43,47 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.23 1999/03/30 03:01:42 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.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"; --- 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";