diff -rNc2 dhcp-2.0b1pl13/Makefile.conf dhcp-2.0b1pl14/Makefile.conf *** dhcp-2.0b1pl13/Makefile.conf Wed Feb 3 11:46:04 1999 --- dhcp-2.0b1pl14/Makefile.conf Fri Feb 19 09:37:17 1999 *************** *** 40,44 **** FFMANEXT = .0 INSTALL = install -c ! MANINSTALL = install -c CHMOD = chmod CATMANPAGES = --- 40,44 ---- FFMANEXT = .0 INSTALL = install -c ! MANINSTALL = install -c -m 444 CHMOD = chmod CATMANPAGES = diff -rNc2 dhcp-2.0b1pl13/README dhcp-2.0b1pl14/README *** dhcp-2.0b1pl13/README Tue Feb 16 12:36:59 1999 --- dhcp-2.0b1pl14/README Fri Feb 19 10:30:18 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 13 ! February 16, 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 14 ! February 19, 1998 This is the first Beta release of Version 2 of the Internet Software *************** *** 48,54 **** the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl13.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl13 subdirectory that you've just created and configure the source tree by typing: --- 48,54 ---- the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl14.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl14 subdirectory that you've just created and configure the source tree by typing: diff -rNc2 dhcp-2.0b1pl13/RELNOTES dhcp-2.0b1pl14/RELNOTES *** dhcp-2.0b1pl13/RELNOTES Tue Feb 16 12:37:41 1999 --- dhcp-2.0b1pl14/RELNOTES Fri Feb 19 10:57:26 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 13 ! February 16, 1998 Release Notes --- 1,6 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 14 ! February 19, 1998 Release Notes *************** *** 54,57 **** --- 54,72 ---- experiment, or for sites that desperately need the new features. + CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 13 + + - Support DESTDIR on installs. + + - Fix a bug in dhcp.c where a store through a null pointer would + be made under some reasonably common circumstances. + + - Add test for ARPHRD_TUNNEL so that client and server do not fail on + versions of Linux running IPsec implementations or the like. + + - Move tests for constants defined in O.S. headers into osdep.h - test + for HAVE_whatever in .c files. Define relevant HAVE_whatevers in + linux.h, so that versions of linux that define these constants as + enums will still work. + CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 12 *************** *** 281,285 **** - Fix up dhcp-options man page to make it more readable. Note that netbios-name-server is the same thing as WINS. - CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 5 --- 296,299 ---- diff -rNc2 dhcp-2.0b1pl13/client/Makefile.dist dhcp-2.0b1pl14/client/Makefile.dist *** dhcp-2.0b1pl13/client/Makefile.dist Fri Nov 21 23:08:36 1997 --- dhcp-2.0b1pl14/client/Makefile.dist Fri Feb 19 09:38:11 1999 *************** *** 1,5 **** # Makefile.dist # ! # Copyright (c) 1996, 1997 The Internet Software Consortium. # All rights reserved. # --- 1,5 ---- # Makefile.dist # ! # Copyright (c) 1996, 1997, 1999 The Internet Software Consortium. # All rights reserved. # *************** *** 46,77 **** install: $(PROG) $(CATMANPAGES) ! $(INSTALL) dhclient $(CLIENTBINDIR) ! $(CHMOD) 755 $(CLIENTBINDIR)/dhclient if [ x$(SCRIPT) = xnone ]; then \ echo "No client script available."; \ else \ ! $(INSTALL) scripts/$(SCRIPT) $(ETC)/dhclient-script; \ ! $(CHMOD) 700 $(ETC)/dhclient-script; \ ! fi ! if [ ! -d $(ADMMANDIR) ]; then \ ! mkdir $(ADMMANDIR); \ ! chmod 755 $(ADMMANDIR); \ ! fi ! if [ ! -d $(FFMANDIR) ]; then \ ! mkdir $(FFMANDIR); \ ! chmod 755 $(FFMANDIR); \ ! fi ! if [ ! -d $(VARDB) ]; then \ ! mkdir $(VARDB); \ ! chmod 755 $(VARDB); \ fi $(MANINSTALL) $(MANFROM) dhclient.cat8 $(MANTO) \ ! $(ADMMANDIR)/dhclient$(ADMMANEXT) $(MANINSTALL) $(MANFROM) dhclient-script.cat8 $(MANTO) \ ! $(ADMMANDIR)/dhclient-script$(ADMMANEXT) $(MANINSTALL) $(MANFROM) dhclient.conf.cat5 $(MANTO) \ ! $(FFMANDIR)/dhclient.conf$(FFMANEXT) $(MANINSTALL) $(MANFROM) dhclient.leases.cat5 $(MANTO) \ ! $(FFMANDIR)/dhclient.leases$(FFMANEXT) clean: --- 46,75 ---- install: $(PROG) $(CATMANPAGES) ! for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR); do \ ! foo=""; \ ! for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ ! foo=$${foo}/$$bar; \ ! if [ ! -d $$foo ]; then \ ! mkdir $$foo; \ ! chmod 755 $$foo; \ ! fi; \ ! done; \ ! done ! $(INSTALL) dhclient $(DESTDIR)$(CLIENTBINDIR) ! $(CHMOD) 755 $(DESTDIR)$(CLIENTBINDIR)/dhclient if [ x$(SCRIPT) = xnone ]; then \ echo "No client script available."; \ else \ ! $(INSTALL) scripts/$(SCRIPT) $(DESTDIR)$(ETC)/dhclient-script; \ ! $(CHMOD) 700 $(DESTDIR)$(ETC)/dhclient-script; \ fi $(MANINSTALL) $(MANFROM) dhclient.cat8 $(MANTO) \ ! $(DESTDIR)$(ADMMANDIR)/dhclient$(ADMMANEXT) $(MANINSTALL) $(MANFROM) dhclient-script.cat8 $(MANTO) \ ! $(DESTDIR)$(ADMMANDIR)/dhclient-script$(ADMMANEXT) $(MANINSTALL) $(MANFROM) dhclient.conf.cat5 $(MANTO) \ ! $(DESTDIR)$(FFMANDIR)/dhclient.conf$(FFMANEXT) $(MANINSTALL) $(MANFROM) dhclient.leases.cat5 $(MANTO) \ ! $(DESTDIR)$(FFMANDIR)/dhclient.leases$(FFMANEXT) clean: diff -rNc2 dhcp-2.0b1pl13/client/dhclient.c dhcp-2.0b1pl14/client/dhclient.c *** dhcp-2.0b1pl13/client/dhclient.c Tue Feb 16 12:36:57 1999 --- dhcp-2.0b1pl14/client/dhclient.c Fri Feb 19 10:30:19 1999 *************** *** 57,61 **** #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.18 1999/02/16 20:36:57 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.20 1999/02/19 18:30: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.0b1pl13"; 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"; --- 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.0b1pl14"; 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"; *************** *** 1702,1706 **** ip -> client -> packet.hlen = ip -> hw_address.hlen; ip -> client -> packet.hops = 0; ! ip -> client -> packet.xid = ip -> client -> xid; ip -> client -> packet.secs = 0; ip -> client -> packet.flags = 0; --- 1702,1706 ---- ip -> client -> packet.hlen = ip -> hw_address.hlen; ip -> client -> packet.hops = 0; ! ip -> client -> packet.xid = random (); ip -> client -> packet.secs = 0; ip -> client -> packet.flags = 0; diff -rNc2 dhcp-2.0b1pl13/common/Makefile.dist dhcp-2.0b1pl14/common/Makefile.dist *** dhcp-2.0b1pl13/common/Makefile.dist Tue Dec 22 14:48:06 1998 --- dhcp-2.0b1pl14/common/Makefile.dist Fri Feb 19 10:00:56 1999 *************** *** 1,5 **** # Makefile.dist # ! # Copyright (c) 1996 The Internet Software Consortium. All rights reserved. # # Redistribution and use in source and binary forms, with or without --- 1,6 ---- # Makefile.dist # ! # Copyright (c) 1996, 1999 The Internet Software Consortium. ! # All rights reserved. # # Redistribution and use in source and binary forms, with or without *************** *** 51,60 **** install: $(CATMANPAGES) ! if [ ! -d $(FFMANDIR) ]; then \ ! mkdir $(FFMANDIR); \ ! chmod 755 $(FFMANDIR); \ ! fi $(MANINSTALL) $(MANFROM) dhcp-options.cat5 $(MANTO) \ ! $(FFMANDIR)/dhcp-options$(FFMANEXT) --- 52,67 ---- install: $(CATMANPAGES) ! for dir in $(FFMANDIR); do \ ! foo=""; \ ! for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ ! foo=$${foo}/$$bar; \ ! if [ ! -d $$foo ]; then \ ! mkdir $$foo; \ ! chmod 755 $$foo; \ ! fi; \ ! done; \ ! done $(MANINSTALL) $(MANFROM) dhcp-options.cat5 $(MANTO) \ ! $(DESTDIR)$(FFMANDIR)/dhcp-options$(FFMANEXT) diff -rNc2 dhcp-2.0b1pl13/common/dispatch.c dhcp-2.0b1pl14/common/dispatch.c *** dhcp-2.0b1pl13/common/dispatch.c Sat Feb 13 11:17:03 1999 --- dhcp-2.0b1pl14/common/dispatch.c Fri Feb 19 10:17:33 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dispatch.c,v 1.47.2.10 1999/02/13 19:17:03 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: dispatch.c,v 1.47.2.11 1999/02/19 18:17:33 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 141,145 **** get a list of configurable interfaces. */ if ((ifr.ifr_flags & IFF_LOOPBACK) || ! #ifdef IFF_POINTOPOINT (ifr.ifr_flags & IFF_POINTOPOINT) || #endif --- 141,145 ---- get a list of configurable interfaces. */ if ((ifr.ifr_flags & IFF_LOOPBACK) || ! #ifdef HAVE_IFF_POINTOPOINT (ifr.ifr_flags & IFF_POINTOPOINT) || #endif *************** *** 169,173 **** /* If we have the capability, extract link information and record it in a linked list. */ ! #ifdef AF_LINK if (ifp -> ifr_addr.sa_family == AF_LINK) { struct sockaddr_dl *foo = ((struct sockaddr_dl *) --- 169,173 ---- /* If we have the capability, extract link information and record it in a linked list. */ ! #ifdef HAVE_AF_LINK if (ifp -> ifr_addr.sa_family == AF_LINK) { struct sockaddr_dl *foo = ((struct sockaddr_dl *) *************** *** 329,333 **** /* Now cycle through all the interfaces we found, looking for hardware addresses. */ ! #if defined (SIOCGIFHWADDR) && !defined (AF_LINK) for (tmp = interfaces; tmp; tmp = tmp -> next) { struct ifreq ifr; --- 329,333 ---- /* Now cycle through all the interfaces we found, looking for hardware addresses. */ ! #if defined (HAVE_SIOCGIFHWADDR) && !defined (HAVE_AF_LINK) for (tmp = interfaces; tmp; tmp = tmp -> next) { struct ifreq ifr; *************** *** 353,357 **** switch (sa.sa_family) { ! #ifdef ARPHRD_LOOPBACK case ARPHRD_LOOPBACK: /* ignore loopback interface */ --- 353,361 ---- switch (sa.sa_family) { ! #ifdef HAVE_ARPHRD_TUNNEL ! case ARPHRD_TUNNEL: ! /* ignore tunnel interfaces. */ ! #endif ! #ifdef HAVE_ARPHRD_LOOPBACK case ARPHRD_LOOPBACK: /* ignore loopback interface */ *************** *** 383,387 **** break; ! #ifdef ARPHRD_METRICOM case ARPHRD_METRICOM: tmp -> hw_address.hlen = 6; --- 387,391 ---- break; ! #ifdef HAVE_ARPHRD_METRICOM case ARPHRD_METRICOM: tmp -> hw_address.hlen = 6; *************** *** 396,400 **** } } ! #endif /* defined (SIOCGIFHWADDR) && !defined (AF_LINK) */ /* If we're just trying to get a list of interfaces that we might --- 400,404 ---- } } ! #endif /* defined (HAVE_SIOCGIFHWADDR) && !defined (HAVE_AF_LINK) */ /* If we're just trying to get a list of interfaces that we might diff -rNc2 dhcp-2.0b1pl13/common/socket.c dhcp-2.0b1pl14/common/socket.c *** dhcp-2.0b1pl13/common/socket.c Sat Feb 13 11:20:07 1999 --- dhcp-2.0b1pl14/common/socket.c Fri Feb 19 10:17:34 1999 *************** *** 51,55 **** #ifndef lint static char copyright[] = ! "$Id: socket.c,v 1.26.2.7 1999/02/13 19:20:07 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 51,55 ---- #ifndef lint static char copyright[] = ! "$Id: socket.c,v 1.26.2.8 1999/02/19 18:17:34 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 103,107 **** int flag; ! #if !defined (SO_BINDTODEVICE) && !defined (USE_FALLBACK) /* Make sure only one interface is registered. */ if (once) --- 103,107 ---- int flag; ! #if !defined (HAVE_SO_BINDTODEVICE) && !defined (USE_FALLBACK) /* Make sure only one interface is registered. */ if (once) *************** *** 137,141 **** error ("Can't bind to dhcp address: %m"); ! #if defined (SO_BINDTODEVICE) /* Bind this socket to this interface. */ if (info -> ifp && --- 137,141 ---- error ("Can't bind to dhcp address: %m"); ! #if defined (HAVE_SO_BINDTODEVICE) /* Bind this socket to this interface. */ if (info -> ifp && diff -rNc2 dhcp-2.0b1pl13/includes/cf/linux.h dhcp-2.0b1pl14/includes/cf/linux.h *** dhcp-2.0b1pl13/includes/cf/linux.h Thu Feb 4 14:11:30 1999 --- dhcp-2.0b1pl14/includes/cf/linux.h Fri Feb 19 11:14:31 1999 *************** *** 112,115 **** --- 112,121 ---- # define LINUX_SLASHPROC_DISCOVERY # define PROCDEV_DEVICE "/proc/net/dev" + # define HAVE_ARPHRD_TUNNEL + # define HAVE_ARPHRD_METRICOM + # define HAVE_ARPHRD_IEEE802 + # define HAVE_ARPHRD_LOOPBACK + # define HAVE_SO_BINDTODEVICE + # define HAVE_SIOCGIFHWADDR # else # define USE_SOCKETS diff -rNc2 dhcp-2.0b1pl13/includes/osdep.h dhcp-2.0b1pl14/includes/osdep.h *** dhcp-2.0b1pl13/includes/osdep.h Sat Feb 13 11:21:03 1999 --- dhcp-2.0b1pl14/includes/osdep.h Fri Feb 19 10:17:34 1999 *************** *** 231,232 **** --- 231,265 ---- # define BPF_FORMAT "/dev/bpf%d" #endif + + #if defined (IFF_POINTOPOINT) && !defined (HAVE_IFF_POINTOPOINT) + # define HAVE_IFF_POINTOPOINT + #endif + + #if defined (AF_LINK) && !defined (HAVE_AF_LINK) + # define HAVE_AF_LINK + #endif + + #if defined (ARPHRD_TUNNEL) && !defined (HAVE_ARPHRD_TUNNEL) + # define HAVE_ARPHRD_TUNNEL + #endif + + #if defined (ARPHRD_LOOPBACK) && !defined (HAVE_ARPHRD_LOOPBACK) + # define HAVE_ARPHRD_LOOPBACK + #endif + + #if defined (ARPHRD_METRICOM) && !defined (HAVE_ARPHRD_METRICOM) + # define HAVE_ARPHRD_METRICOM + #endif + + #if defined (SO_BINDTODEVICE) && !defined (HAVE_SO_BINDTODEVICE) + # define HAVE_SO_BINDTODEVICE + #endif + + #if defined (SIOCGIFHWADDR) && !defined (HAVE_SIOCGIFHWADDR) + # define HAVE_SIOCGIFHWADDR + #endif + + #if defined (AF_LINK) && !defined (HAVE_AF_LINK) + # define HAVE_AF_LINK + #endif + diff -rNc2 dhcp-2.0b1pl13/relay/Makefile.dist dhcp-2.0b1pl14/relay/Makefile.dist *** dhcp-2.0b1pl13/relay/Makefile.dist Fri Mar 28 19:31:08 1997 --- dhcp-2.0b1pl14/relay/Makefile.dist Fri Feb 19 10:00:48 1999 *************** *** 45,63 **** install: $(PROG) $(CATMANPAGES) ! $(INSTALL) dhcrelay $(BINDIR); $(CHMOD) 755 $(BINDIR)/dhcrelay ! if [ ! -d $(ADMMANDIR) ]; then \ ! mkdir $(ADMMANDIR); \ ! chmod 755 $(ADMMANDIR); \ ! fi ! if [ ! -d $(FFMANDIR) ]; then \ ! mkdir $(FFMANDIR); \ ! chmod 755 $(FFMANDIR); \ ! fi ! if [ ! -d $(VARDB) ]; then \ ! mkdir $(VARDB); \ ! chmod 755 $(VARDB); \ ! fi $(MANINSTALL) $(MANFROM) dhcrelay.cat8 $(MANTO) \ ! $(ADMMANDIR)/dhcrelay$(ADMMANEXT) clean: --- 45,62 ---- install: $(PROG) $(CATMANPAGES) ! for dir in $(BINDIR) $(ADMMANDIR); do \ ! foo=""; \ ! for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ ! foo=$${foo}/$$bar; \ ! if [ ! -d $$foo ]; then \ ! mkdir $$foo; \ ! chmod 755 $$foo; \ ! fi; \ ! done; \ ! done ! $(INSTALL) dhcrelay $(DESTDIR)$(BINDIR) ! $(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcrelay $(MANINSTALL) $(MANFROM) dhcrelay.cat8 $(MANTO) \ ! $(DESTDIR)$(ADMMANDIR)/dhcrelay$(ADMMANEXT) clean: diff -rNc2 dhcp-2.0b1pl13/relay/dhcrelay.c dhcp-2.0b1pl14/relay/dhcrelay.c *** dhcp-2.0b1pl13/relay/dhcrelay.c Tue Feb 16 12:36:58 1999 --- dhcp-2.0b1pl14/relay/dhcrelay.c Fri Feb 19 10:32:46 1999 *************** *** 43,47 **** #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.13 1999/02/16 20:36:58 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.15 1999/02/19 18:32:46 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.0b1pl13"; 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"; --- 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.0b1pl14"; 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"; *************** *** 342,346 **** static void usage () { ! error ("Usage: dhcrelay [-c] [-p ] [server1 [... serverN]]"); } --- 342,347 ---- static void usage () { ! warn ("Usage: dhcrelay [-i] [-d] [-i if0] [...-i ifN] [-p ]"); ! error (" [server1 [... serverN]]"); } diff -rNc2 dhcp-2.0b1pl13/server/Makefile.dist dhcp-2.0b1pl14/server/Makefile.dist *** dhcp-2.0b1pl13/server/Makefile.dist Fri Nov 21 23:14:58 1997 --- dhcp-2.0b1pl14/server/Makefile.dist Fri Feb 19 09:58:24 1999 *************** *** 1,5 **** # Makefile.dist # ! # Copyright (c) 1996, 1997 The Internet Software Consortium. # All rights reserved. # --- 1,5 ---- # Makefile.dist # ! # Copyright (c) 1996, 1997, 1999 The Internet Software Consortium. # All rights reserved. # *************** *** 45,67 **** install: $(PROG) $(CATMANPAGES) ! $(INSTALL) dhcpd $(BINDIR); $(CHMOD) 755 $(BINDIR)/dhcpd ! if [ ! -d $(ADMMANDIR) ]; then \ ! mkdir $(ADMMANDIR); \ ! chmod 755 $(ADMMANDIR); \ ! fi ! if [ ! -d $(FFMANDIR) ]; then \ ! mkdir $(FFMANDIR); \ ! chmod 755 $(FFMANDIR); \ ! fi ! if [ ! -d $(VARDB) ]; then \ ! mkdir $(VARDB); \ ! chmod 755 $(VARDB); \ ! fi $(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \ ! $(ADMMANDIR)/dhcpd$(ADMMANEXT) $(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \ ! $(FFMANDIR)/dhcpd.conf$(FFMANEXT) $(MANINSTALL) $(MANFROM) dhcpd.leases.cat5 $(MANTO) \ ! $(FFMANDIR)/dhcpd.leases$(FFMANEXT) clean: --- 45,66 ---- install: $(PROG) $(CATMANPAGES) ! for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \ ! foo=""; \ ! for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ ! foo=$${foo}/$$bar; \ ! if [ ! -d $$foo ]; then \ ! mkdir $$foo; \ ! chmod 755 $$foo; \ ! fi; \ ! done; \ ! done ! $(INSTALL) dhcpd $(DESTDIR)$(BINDIR) ! $(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcpd $(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \ ! $(DESTDIR)$(ADMMANDIR)/dhcpd$(ADMMANEXT) $(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \ ! $(DESTDIR)$(FFMANDIR)/dhcpd.conf$(FFMANEXT) $(MANINSTALL) $(MANFROM) dhcpd.leases.cat5 $(MANTO) \ ! $(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT) clean: diff -rNc2 dhcp-2.0b1pl13/server/dhcp.c dhcp-2.0b1pl14/server/dhcp.c *** dhcp-2.0b1pl13/server/dhcp.c Tue Feb 16 11:18:35 1999 --- dhcp-2.0b1pl14/server/dhcp.c Fri Feb 19 09:59:56 1999 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dhcp.c,v 1.57.2.16 1999/02/16 19:18:35 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.17 1999/02/19 17:59:56 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 1361,1365 **** that client. */ if (ip_lease && (ip_lease -> shared_network != share)) { ! *ours = 1; ip_lease = (struct lease *)0; strcpy (dhcp_message, "requested address on bad subnet"); --- 1361,1366 ---- that client. */ if (ip_lease && (ip_lease -> shared_network != share)) { ! if (ours) ! *ours = 1; ip_lease = (struct lease *)0; strcpy (dhcp_message, "requested address on bad subnet"); *************** *** 1391,1395 **** strcpy (dhcp_message, "requested address is not available"); ip_lease = (struct lease *)0; ! *ours = 1; /* If we get to here and fixed_lease is not null, that means --- 1392,1397 ---- strcpy (dhcp_message, "requested address is not available"); ip_lease = (struct lease *)0; ! if (ours) ! *ours = 1; /* If we get to here and fixed_lease is not null, that means diff -rNc2 dhcp-2.0b1pl13/server/dhcpd.c dhcp-2.0b1pl14/server/dhcpd.c *** dhcp-2.0b1pl13/server/dhcpd.c Tue Feb 16 12:36:55 1999 --- dhcp-2.0b1pl14/server/dhcpd.c Fri Feb 19 10:30:19 1999 *************** *** 43,47 **** #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.12 1999/02/16 20:36:55 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.13 1999/02/19 18:30:19 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.0b1pl13 "; 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"; --- 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.0b1pl14 "; 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";