diff -rNc2 dhcp-2.0b1pl22/README dhcp-2.0b1pl23/README *** dhcp-2.0b1pl22/README Mon Mar 29 19:01:43 1999 --- dhcp-2.0b1pl23/README Tue Mar 30 14:07:39 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 22 ! March 29, 1998 Documentation for this software includes this README file, the --- 1,6 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 23 ! March 30, 1998 Documentation for this software includes this README file, the *************** *** 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: --- 89,95 ---- the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl23.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl23 subdirectory that you've just created and configure the source tree by typing: *************** *** 322,328 **** --- 322,393 ---- dhcp-server and dhcp-announce mailing lists. If you will be using dhclient, you should subscribe to the dhcp-client mailing list. + + If you need help, you should ask on the dhcp-server or dhcp-client + mailing list (or both) - whichever is appropriate to your + application. This includes reporting bugs. Please do not report + bugs in old software releases - fetch the latest release and see if + the bug is still in that copy of the software, and if it's not, _then_ + report it. It's okay to report bugs in the latest patchlevel of a + major version that's not the most recent major version, though - for + example, if you're running 2.0, you don't have to upgrade to 3.0 + before you can report bugs. + + PLEASE READ THIS README FILE CAREFULLY BEFORE REPORTING BUGS! + + When you report bugs, please provide us complete information. A list + of information we need follows. Please read it carefully, and put + all the information you can into your initial bug report, so that we + don't have to ask you any questions in order to figure out your + problem. + + - The specific operating system name and version of the + machine on which the DHCP server or client is running. + - The specific operating system name and version of the + machine on which the client is running, if you are having + trouble getting a client working with the server. + - If you're running Linux, the version number we care about is + the kernel version and maybe the library version, not the + distribution version - e.g., while we don't mind knowing + that you're running Redhat version mumble.foo, we must know + what kernel version you're running, and it helps if you can + tell us what version of the C library you're running, + although if you don't know that off the top of your head it + may be hard for you to figure it out, so don't go crazy + trying. + - The specific version of the DHCP distribution you're + running, for example 2.0b1pl19, not 2.0. + - Please explain the problem carefully, thinking through what + you're saying to ensure that you don't assume we know + something about your situation that we don't know. + - Include your dhcpd.conf and dhcpd.leases file if they're not + huge (if they are huge, we may need them anyway, but don't + send them until you're asked). + - Include a log of your server or client running until it + encounters the problem - for example, if you are having + trouble getting some client to get an address, restart the + server with the -d flag and then restart the client, and + send us what the server prints. Likewise, with the client, + include the output of the client as it fails to get an + address or otherwise does the wrong thing. Do not leave + out parts of the output that you think aren't interesting. + - If the client or server is dumping core, please run the + debugger and get a stack trace, and include that in your + bug report. For example, if your debugger is gdb, do the + following: + + gdb dhcpd dhcpd.core + (gdb) where + [...] + (gdb) quit + + This assumes that it's the dhcp server you're debugging, and + that the core file is in dhcpd.core. + PLEASE DO NOT send queries about non-isc clients to the dhcp-client mailing list. If you're asking about them on an ISC mailing list, it's probably because you're using the ISC DHCP server, so ask there. + If you are having problems with a client whose executable is called + dhcpcd, this is _not_ the ISC DHCP client, and we probably can't help + you with it. Please see http://www.fugue.com/dhcp/lists for details on how to diff -rNc2 dhcp-2.0b1pl22/RELNOTES dhcp-2.0b1pl23/RELNOTES *** dhcp-2.0b1pl22/RELNOTES Mon Mar 29 18:59:22 1999 --- dhcp-2.0b1pl23/RELNOTES Tue Mar 30 14:08:25 1999 *************** *** 54,57 **** --- 54,63 ---- experiment, or for sites that desperately need the new features. + CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 22 + + - Test for lease before dereferencing it in dhcprequest. + + - Free the client parameter request list in dhcpnak if there is one. + CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 21 diff -rNc2 dhcp-2.0b1pl22/client/dhclient.c dhcp-2.0b1pl23/client/dhclient.c *** dhcp-2.0b1pl22/client/dhclient.c Mon Mar 29 19:01:40 1999 --- dhcp-2.0b1pl23/client/dhclient.c Tue Mar 30 14:07:41 1999 *************** *** 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 */ --- 57,61 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.33 1999/03/30 22:07:41 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.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"; --- 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.0b1pl23"; 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 -rNc2 dhcp-2.0b1pl22/relay/dhcrelay.c dhcp-2.0b1pl23/relay/dhcrelay.c *** dhcp-2.0b1pl22/relay/dhcrelay.c Mon Mar 29 19:01:42 1999 --- dhcp-2.0b1pl23/relay/dhcrelay.c Tue Mar 30 14:07:42 1999 *************** *** 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 */ --- 43,47 ---- #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.26 1999/03/30 22:07: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.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"; --- 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.0b1pl23"; 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 -rNc2 dhcp-2.0b1pl22/server/dhcp.c dhcp-2.0b1pl23/server/dhcp.c *** dhcp-2.0b1pl22/server/dhcp.c Mon Mar 29 14:29:31 1999 --- dhcp-2.0b1pl23/server/dhcp.c Tue Mar 30 12:40:59 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dhcp.c,v 1.57.2.23 1999/03/29 22:29:31 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: dhcp.c,v 1.57.2.24 1999/03/30 20:40:59 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 315,319 **** /* If we're not allowed to serve this client anymore, don't. */ ! if (!lease -> host && !lease -> subnet -> group -> boot_unknown_clients) { note ("Ignoring unknown client %s", --- 315,320 ---- /* If we're not allowed to serve this client anymore, don't. */ ! if (lease && ! !lease -> host && !lease -> subnet -> group -> boot_unknown_clients) { note ("Ignoring unknown client %s", *************** *** 450,453 **** --- 451,455 ---- struct packet outgoing; struct hardware hto; + int i; struct tree_cache *options [256]; *************** *** 477,483 **** /* Do not use the client's requested parameter list. */ ! packet -> options [DHO_DHCP_PARAMETER_REQUEST_LIST].len = 0; ! packet -> options [DHO_DHCP_PARAMETER_REQUEST_LIST].data = ! (unsigned char *)0; /* Set up the option buffer... */ --- 479,488 ---- /* Do not use the client's requested parameter list. */ ! i = DHO_DHCP_PARAMETER_REQUEST_LIST; ! if (packet -> options [i].data) { ! packet -> options [i].len = 0; ! dfree (packet -> options [i].data, "nak_lease"); ! packet -> options [i].data = (unsigned char *)0; ! } /* Set up the option buffer... */ diff -rNc2 dhcp-2.0b1pl22/server/dhcpd.c dhcp-2.0b1pl23/server/dhcpd.c *** dhcp-2.0b1pl22/server/dhcpd.c Mon Mar 29 19:01:42 1999 --- dhcp-2.0b1pl23/server/dhcpd.c Tue Mar 30 14:07:40 1999 *************** *** 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 --- 43,47 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.24 1999/03/30 22:07:40 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.0b1pl23"; 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";