diff -rNc2 dhcp-2.0b1pl26/README dhcp-2.0b1pl27/README *** dhcp-2.0b1pl26/README Mon Apr 12 15:33:49 1999 --- dhcp-2.0b1pl27/README Sat Apr 24 09:44:03 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 26 ! April 12, 1999 Documentation for this software includes this README file, the --- 1,6 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 27 ! April 23, 1999 Documentation for this software includes this README file, the *************** *** 87,96 **** the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl26.tar.gz |tar xvf - On BSD/OS, you have to type gzcat, not zcat, and you may run into similar problems on other operating systems. ! Now, cd to the dhcp-2.0b1pl26 subdirectory that you've just created and configure the source tree by typing: --- 87,96 ---- the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl27.tar.gz |tar xvf - On BSD/OS, you have to type gzcat, not zcat, and you may run into similar problems on other operating systems. ! Now, cd to the dhcp-2.0b1pl27 subdirectory that you've just created and configure the source tree by typing: *************** *** 420,422 **** Vendor tags and User tags are not currently supported. ! --- 420,422 ---- Vendor tags and User tags are not currently supported. ! These two omissions are fixed in the 3.0 release. diff -rNc2 dhcp-2.0b1pl26/RELNOTES dhcp-2.0b1pl27/RELNOTES *** dhcp-2.0b1pl26/RELNOTES Mon Apr 12 15:34:39 1999 --- dhcp-2.0b1pl27/RELNOTES Sat Apr 24 12:39:58 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 26 ! April 12, 1999 Release Notes --- 1,6 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 27 ! April 23, 1999 Release Notes *************** *** 53,56 **** --- 53,67 ---- 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 26 + + - Fix UDP/IP checksum code + + - Fix UDP payload length computation to prevent logging of spurious + errors. + + - Support compilation on MacOS X + + - Add support for some options that were added in RFC2132. CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 25 diff -rNc2 dhcp-2.0b1pl26/client/Makefile.dist dhcp-2.0b1pl27/client/Makefile.dist *** dhcp-2.0b1pl26/client/Makefile.dist Mon Apr 12 15:35:36 1999 --- dhcp-2.0b1pl27/client/Makefile.dist Sat Apr 24 09:45:49 1999 *************** *** 33,36 **** --- 33,38 ---- CATMANPAGES = dhclient.cat8 dhclient.conf.cat5 dhclient-script.cat8 \ dhclient.leases.cat5 + SEDMANPAGES = dhclient.man8 dhclient.conf.man5 dhclient-script.man8 \ + dhclient.leases.man5 SRCS = dhclient.c clparse.c OBJS = dhclient.o clparse.o *************** *** 78,82 **** realclean: clean ! -rm -f $(PROG) $(CATMANPAGES) *~ #* distclean: realclean --- 80,84 ---- realclean: clean ! -rm -f $(PROG) $(CATMANPAGES) $(SEDMANPAGES) *~ #* distclean: realclean diff -rNc2 dhcp-2.0b1pl26/client/dhclient.c dhcp-2.0b1pl27/client/dhclient.c *** dhcp-2.0b1pl26/client/dhclient.c Mon Apr 12 15:33:50 1999 --- dhcp-2.0b1pl27/client/dhclient.c Sat Apr 24 09:55:19 1999 *************** *** 57,61 **** #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.36 1999/04/12 22:33:50 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.37 1999/04/24 16:55:19 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.0b1pl26"; 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.0b1pl27"; 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.0b1pl26/common/Makefile.dist dhcp-2.0b1pl27/common/Makefile.dist *** dhcp-2.0b1pl26/common/Makefile.dist Mon Apr 12 15:35:37 1999 --- dhcp-2.0b1pl27/common/Makefile.dist Sat Apr 24 09:45:49 1999 *************** *** 32,35 **** --- 32,36 ---- CATMANPAGES = dhcp-options.cat5 + SEDMANPAGES = dhcp-options.man5 SRC = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \ lpf.c packet.c memory.c print.c options.c inet.c convert.c \ *************** *** 70,74 **** realclean: clean ! -rm -f libdhcp.a *~ #* $(CATMANPAGES) distclean: realclean --- 71,75 ---- realclean: clean ! -rm -f libdhcp.a *~ #* $(CATMANPAGES) $(SEDMANPAGES) distclean: realclean diff -rNc2 dhcp-2.0b1pl26/common/dhcp-options.5 dhcp-2.0b1pl27/common/dhcp-options.5 *** dhcp-2.0b1pl26/common/dhcp-options.5 Thu Apr 8 14:37:16 1999 --- dhcp-2.0b1pl27/common/dhcp-options.5 Sat Apr 24 09:46:43 1999 *************** *** 570,573 **** --- 570,682 ---- against the client identifier. .RE + .B option \fBnisplus-domain\fR \fIstring\fR\fB;\fR + .RS 0.25i + .PP + This option specifies the name of the client's NIS+ domain. The + domain is formatted as a character string consisting of characters + from the NVT ASCII character set. + .RE + .B option \fBnisplus-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... + ]\fB;\fR + .RS 0.25i + .PP + This option specifies a list of IP addresses indicating NIS+ servers + available to the client. Servers should be listed in order of + preference. + .RE + .PP + .B option \fBtftp-server-name\fR \fIstring\fR\fB;\fR + .RS 0.25i + .PP + This option is used to identify a TFTP server and, if supported by the + client, should have the same effect as the \fBserver-name\fR + declaration. BOOTP clients are unlikely to support this option. + Some DHCP clients will support it, and others actually require it. + .RE + .PP + .B option \fBbootfile-name\fR \fIstring\fR\fB;\fR + .RS 0.25i + .PP + This option is used to identify a bootstrap file. If supported by the + client, it should have the same effect as the \fBfilename\fR + declaration. BOOTP clients are unlikely to support this option. Some + DHCP clients will support it, and others actually require it. + .RE + .PP + .B option \fBmobile-ip-home-agent\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + This option specifies a list of IP addresses indicating mobile IP + home agents available to the client. Agents should be listed in + order of preference, although normally there will be only one such + agent. + .RE + .PP + .B option \fBsmtp-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The SMTP server option specifies a list of SMTP servers available to + the client. Servers should be listed in order of preference. + .RE + .PP + .B option \fBpop-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The POP3 server option specifies a list of POP3 available to the + client. Servers should be listed in order of preference. + .RE + .PP + .B option \fBnntp-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The NNTP server option specifies a list of NNTP available to the + client. Servers should be listed in order of preference. + .RE + .PP + .B option \fBwww-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The WWW server option specifies a list of WWW available to the + client. Servers should be listed in order of preference. + .RE + .PP + .B option \fBfinger-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The Finger server option specifies a list of Finger available to the + client. Servers should be listed in order of preference. + .RE + .PP + .B option \fBirc-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The IRC server option specifies a list of IRC available to the + client. Servers should be listed in order of preference. + .RE + .PP + .B option \fBstreettalk-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The StreetTalk server option specifies a list of StreetTalk servers + available to the client. Servers should be listed in order of + preference. + .RE + .PP + .B option \fBstreetalk-directory-assistance-server\fR \fIip-address\fR [\fB,\fR + \fIip-address\fR... ]\fB;\fR + .RS 0.25i + .PP + The StreetTalk Directory Assistance (STDA) server option specifies a + list of STDA servers available to the client. Servers should be + listed in order of preference. + .RE .SH SEE ALSO dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcpd(8), diff -rNc2 dhcp-2.0b1pl26/common/dlpi.c dhcp-2.0b1pl27/common/dlpi.c *** dhcp-2.0b1pl26/common/dlpi.c Mon Mar 29 14:07:13 1999 --- dhcp-2.0b1pl27/common/dlpi.c Sat Apr 24 09:48:10 1999 *************** *** 83,86 **** --- 83,91 ---- */ + #ifndef lint + static char copyright[] = + "$Id: dlpi.c,v 1.2.2.7 1999/04/24 16:48:10 mellon Exp $ Copyright (c) 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; + #endif /* not lint */ + #include "dhcpd.h" diff -rNc2 dhcp-2.0b1pl26/common/inet.c dhcp-2.0b1pl27/common/inet.c *** dhcp-2.0b1pl26/common/inet.c Mon Mar 29 15:19:37 1999 --- dhcp-2.0b1pl27/common/inet.c Sat Apr 24 09:48:10 1999 *************** *** 41,44 **** --- 41,49 ---- */ + #ifndef lint + static char copyright[] = + "$Id: inet.c,v 1.5.2.2 1999/04/24 16:48:10 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; + #endif /* not lint */ + #include "dhcpd.h" diff -rNc2 dhcp-2.0b1pl26/common/packet.c dhcp-2.0b1pl27/common/packet.c *** dhcp-2.0b1pl26/common/packet.c Sun Apr 11 13:31:18 1999 --- dhcp-2.0b1pl27/common/packet.c Sat Apr 24 08:31:47 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: packet.c,v 1.18.2.3 1999/04/11 20:31:18 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: packet.c,v 1.18.2.4 1999/04/24 15:31:47 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 73,76 **** --- 73,79 ---- #endif sum += (u_int16_t) ntohs(*((u_int16_t *)(buf + i))); + /* Add carry. */ + if (sum > 0xFFFF) + sum -= 0xFFFF; } *************** *** 82,85 **** --- 85,91 ---- #endif sum += buf [i] << 8; + /* Add carry. */ + if (sum > 0xFFFF) + sum -= 0xFFFF; } *************** *** 87,92 **** } ! /* Fold the upper sixteen bits of the checksum down into the lower bits, ! complement the sum, and then put it into network byte order. */ u_int32_t wrapsum (sum) --- 93,97 ---- } ! /* Finish computing the sum, and then put it into network byte order. */ u_int32_t wrapsum (sum) *************** *** 97,111 **** #endif ! while (sum > 0x10000) { ! sum = (sum >> 16) + (sum & 0xFFFF); ! #ifdef DEBUG_CHECKSUM_VERBOSE ! debug ("sum = %x", sum); ! #endif ! sum += (sum >> 16); ! #ifdef DEBUG_CHECKSUM_VERBOSE ! debug ("sum = %x", sum); ! #endif ! } ! sum = sum ^ 0xFFFF; #ifdef DEBUG_CHECKSUM_VERBOSE debug ("sum = %x", sum); --- 102,106 ---- #endif ! sum = ~sum & 0xFFFF; #ifdef DEBUG_CHECKSUM_VERBOSE debug ("sum = %x", sum); *************** *** 313,317 **** return -1; } ! if (len + data != buf + buflen) debug ("accepting packet with data after udp payload."); } --- 308,312 ---- return -1; } ! if (len + data != buf + bufix + buflen) debug ("accepting packet with data after udp payload."); } *************** *** 334,338 **** if (udp_packets_seen > 4 && (udp_packets_seen / udp_packets_bad_checksum) < 2) { ! note ("%d bad udp checksums in $d packets", udp_packets_bad_checksum, udp_packets_seen); udp_packets_seen = udp_packets_bad_checksum = 0; --- 329,333 ---- if (udp_packets_seen > 4 && (udp_packets_seen / udp_packets_bad_checksum) < 2) { ! note ("%d bad udp checksums in %d packets", udp_packets_bad_checksum, udp_packets_seen); udp_packets_seen = udp_packets_bad_checksum = 0; diff -rNc2 dhcp-2.0b1pl26/common/tables.c dhcp-2.0b1pl27/common/tables.c *** dhcp-2.0b1pl26/common/tables.c Tue Dec 22 14:45:44 1998 --- dhcp-2.0b1pl27/common/tables.c Sat Apr 24 09:46:44 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: tables.c,v 1.13.2.3 1998/12/22 22:45:44 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: tables.c,v 1.13.2.4 1999/04/24 16:46:44 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 131,148 **** { "option-62", "X", &dhcp_universe, 62 }, { "option-63", "X", &dhcp_universe, 63 }, ! { "option-64", "X", &dhcp_universe, 64 }, ! { "option-65", "X", &dhcp_universe, 65 }, ! { "option-66", "X", &dhcp_universe, 66 }, ! { "option-67", "X", &dhcp_universe, 67 }, ! { "option-68", "X", &dhcp_universe, 68 }, ! { "option-69", "X", &dhcp_universe, 69 }, ! { "option-70", "X", &dhcp_universe, 70 }, ! { "option-71", "X", &dhcp_universe, 71 }, ! { "option-72", "X", &dhcp_universe, 72 }, ! { "option-73", "X", &dhcp_universe, 73 }, ! { "option-74", "X", &dhcp_universe, 74 }, ! { "option-75", "X", &dhcp_universe, 75 }, ! { "option-76", "X", &dhcp_universe, 76 }, ! { "dhcp-user-class-identifier", "t", &dhcp_universe, 77 }, { "option-78", "X", &dhcp_universe, 78 }, { "option-79", "X", &dhcp_universe, 79 }, --- 131,148 ---- { "option-62", "X", &dhcp_universe, 62 }, { "option-63", "X", &dhcp_universe, 63 }, ! { "nisplus-domain", "t", &dhcp_universe, 64 }, ! { "nisplus-servers", "IA", &dhcp_universe, 65 }, ! { "tftp-server-name", "t", &dhcp_universe, 66 }, ! { "bootfile-name", "t", &dhcp_universe, 67 }, ! { "mobile-ip-home-agent", "IA", &dhcp_universe, 68 }, ! { "smtp-server", "IA", &dhcp_universe, 69 }, ! { "pop-server", "IA", &dhcp_universe, 70 }, ! { "nntp-server", "IA", &dhcp_universe, 71 }, ! { "www-server", "IA", &dhcp_universe, 72 }, ! { "finger-server", "IA", &dhcp_universe, 73 }, ! { "irc-server", "IA", &dhcp_universe, 74 }, ! { "streettalk-server", "IA", &dhcp_universe, 75 }, ! { "streettalk-directory-assistance-server", "IA", &dhcp_universe, 76 }, ! { "user-class", "t", &dhcp_universe, 77 }, { "option-78", "X", &dhcp_universe, 78 }, { "option-79", "X", &dhcp_universe, 79 }, diff -rNc2 dhcp-2.0b1pl26/includes/osdep.h dhcp-2.0b1pl27/includes/osdep.h *** dhcp-2.0b1pl26/includes/osdep.h Tue Apr 6 09:00:24 1999 --- dhcp-2.0b1pl27/includes/osdep.h Sat Apr 24 09:48:54 1999 *************** *** 120,127 **** #endif ! #ifdef NeXT ! # ifdef __APPLE__ ! # include "cf/rhapsody.h" ! # else # include "cf/nextstep.h" # endif --- 120,127 ---- #endif ! #ifdef __APPLE__ ! # include "cf/rhapsody.h" ! #else ! # if defined (NeXT) # include "cf/nextstep.h" # endif diff -rNc2 dhcp-2.0b1pl26/relay/Makefile.dist dhcp-2.0b1pl27/relay/Makefile.dist *** dhcp-2.0b1pl26/relay/Makefile.dist Mon Apr 12 15:35:37 1999 --- dhcp-2.0b1pl27/relay/Makefile.dist Sat Apr 24 09:45:50 1999 *************** *** 32,35 **** --- 32,36 ---- CATMANPAGES = dhcrelay.cat8 + SEDMANPAGES = dhcrelay.cat8 SRCS = dhcrelay.c OBJS = dhcrelay.o *************** *** 64,68 **** realclean: clean ! -rm -f $(PROG) $(CATMANPAGES) *~ #* distclean: realclean --- 65,69 ---- realclean: clean ! -rm -f $(PROG) $(CATMANPAGES) $(SEDMANPAGES) *~ #* distclean: realclean diff -rNc2 dhcp-2.0b1pl26/relay/dhcrelay.8 dhcp-2.0b1pl27/relay/dhcrelay.8 *** dhcp-2.0b1pl26/relay/dhcrelay.8 Fri Mar 5 08:05:27 1999 --- dhcp-2.0b1pl27/relay/dhcrelay.8 Sat Apr 24 09:49:37 1999 *************** *** 67,71 **** The Internet Software Consortium DHCP Relay Agent, dhcrelay, provides a means for relaying DHCP and BOOTP requests from a subnet to which ! no DHCP server is directly to one or more DHCP servers on other subnets. .SH OPERATION --- 67,71 ---- The Internet Software Consortium DHCP Relay Agent, dhcrelay, provides a means for relaying DHCP and BOOTP requests from a subnet to which ! no DHCP server is directly connected to one or more DHCP servers on other subnets. .SH OPERATION diff -rNc2 dhcp-2.0b1pl26/relay/dhcrelay.c dhcp-2.0b1pl27/relay/dhcrelay.c *** dhcp-2.0b1pl26/relay/dhcrelay.c Mon Apr 12 15:33:52 1999 --- dhcp-2.0b1pl27/relay/dhcrelay.c Sat Apr 24 09:55:21 1999 *************** *** 43,47 **** #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.29 1999/04/12 22:33:52 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.30 1999/04/24 16:55:21 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.0b1pl26"; 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.0b1pl27"; 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.0b1pl26/server/Makefile.dist dhcp-2.0b1pl27/server/Makefile.dist *** dhcp-2.0b1pl26/server/Makefile.dist Mon Apr 12 15:35:37 1999 --- dhcp-2.0b1pl27/server/Makefile.dist Sat Apr 24 09:45:50 1999 *************** *** 32,35 **** --- 32,36 ---- CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 + SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o *************** *** 68,72 **** realclean: clean ! -rm -f $(PROG) $(CATMANPAGES) *~ #* distclean: realclean --- 69,73 ---- realclean: clean ! -rm -f $(PROG) $(CATMANPAGES) $(SEDMANPAGES) *~ #* distclean: realclean diff -rNc2 dhcp-2.0b1pl26/server/db.c dhcp-2.0b1pl27/server/db.c *** dhcp-2.0b1pl26/server/db.c Wed Aug 5 12:33:16 1998 --- dhcp-2.0b1pl27/server/db.c Sat Apr 24 09:50:05 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: db.c,v 1.17.2.1 1998/08/05 19:33:16 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: db.c,v 1.17.2.2 1999/04/24 16:50:05 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 231,234 **** --- 231,243 ---- error ("Can't fdopen new lease file!"); } + + /* Write an introduction so people don't complain about time + being off. */ + fprintf (db_file, "# All times in this file are in UTC (GMT), not %s", + "your local timezone. This is\n"); + fprintf (db_file, "# not a bug, so please don't ask about it. %s", + "The format of this file is\n"); + fprintf (db_file, + "# documented in the dhcpd.leases(5) manual page.\n\n"); /* Write out all the leases that we know of... */ diff -rNc2 dhcp-2.0b1pl26/server/dhcp.c dhcp-2.0b1pl27/server/dhcp.c *** dhcp-2.0b1pl26/server/dhcp.c Thu Apr 8 14:49:45 1999 --- dhcp-2.0b1pl27/server/dhcp.c Sat Apr 24 09:52:33 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dhcp.c,v 1.57.2.25 1999/04/08 21:49:45 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.26 1999/04/24 16:52:33 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 269,273 **** (packet -> raw -> ciaddr.s_addr && packet -> raw -> giaddr.s_addr) || ! packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len) { /* If we don't know where it came from but we do know --- 269,274 ---- (packet -> raw -> ciaddr.s_addr && packet -> raw -> giaddr.s_addr) || ! (packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len && ! !packet -> raw -> ciaddr.s_addr)) { /* If we don't know where it came from but we do know *************** *** 1472,1476 **** piaddr (cip)); warn ("from the dynamic address pool for %s", ! ip_lease -> subnet -> shared_network -> name); if (fixed_lease) ip_lease = (struct lease *)0; --- 1473,1477 ---- piaddr (cip)); warn ("from the dynamic address pool for %s", ! share -> name); if (fixed_lease) ip_lease = (struct lease *)0; diff -rNc2 dhcp-2.0b1pl26/server/dhcpd.c dhcp-2.0b1pl27/server/dhcpd.c *** dhcp-2.0b1pl26/server/dhcpd.c Mon Apr 12 15:33:50 1999 --- dhcp-2.0b1pl27/server/dhcpd.c Sat Apr 24 09:55:18 1999 *************** *** 43,47 **** #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.27 1999/04/12 22:33:50 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.28 1999/04/24 16:55:18 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.0b1pl26"; 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.0b1pl27"; 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";