diff -rc2 DHCPD-BETA-5.13/bootp.c DHCPD-BETA-5.14/bootp.c *** DHCPD-BETA-5.13/bootp.c Fri Sep 13 12:06:11 1996 --- DHCPD-BETA-5.14/bootp.c Fri Nov 8 12:28:26 1996 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: bootp.c,v 1.19 1996/09/12 22:22:18 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: bootp.c,v 1.20 1996/11/08 20:08:34 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 110,117 **** if (!hp && !(packet -> shared_network -> group -> boot_unknown_clients)) { ! note ("Ignoring unknown BOOTP client %s", print_hw_addr (packet -> raw -> htype, packet -> raw -> hlen, ! packet -> raw -> chaddr)); } --- 110,121 ---- if (!hp && !(packet -> shared_network -> group -> boot_unknown_clients)) { ! note ("Ignoring unknown BOOTP client %s via %s", print_hw_addr (packet -> raw -> htype, packet -> raw -> hlen, ! packet -> raw -> chaddr), ! packet -> raw -> giaddr.s_addr ! ? inet_ntoa (packet -> raw -> giaddr) ! : packet -> interface -> name); ! return; } *************** *** 121,128 **** if (!(packet -> shared_network -> group -> dynamic_bootp)) { lose: ! note ("No applicable record for BOOTP host %s", print_hw_addr (packet -> raw -> htype, packet -> raw -> hlen, ! packet -> raw -> chaddr)); return; } --- 125,135 ---- if (!(packet -> shared_network -> group -> dynamic_bootp)) { lose: ! note ("No applicable record for BOOTP host %s via %s", print_hw_addr (packet -> raw -> htype, packet -> raw -> hlen, ! packet -> raw -> chaddr), ! packet -> raw -> giaddr.s_addr ! ? inet_ntoa (packet -> raw -> giaddr) ! : packet -> interface -> name); return; } diff -rc2 DHCPD-BETA-5.13/cf/linux.h DHCPD-BETA-5.14/cf/linux.h *** DHCPD-BETA-5.13/cf/linux.h Fri Sep 13 12:08:02 1996 --- DHCPD-BETA-5.14/cf/linux.h Fri Nov 8 12:30:29 1996 *************** *** 62,68 **** #include - #define ARPHRD_ETHER 1 - #define ARPHRD_IEEE802 6 - #include /* gettimeofday()*/ #include /* also necessary */ --- 62,65 ---- diff -rc2 DHCPD-BETA-5.13/confpars.c DHCPD-BETA-5.14/confpars.c *** DHCPD-BETA-5.13/confpars.c Fri Sep 13 12:06:24 1996 --- DHCPD-BETA-5.14/confpars.c Fri Nov 8 12:28:42 1996 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: confpars.c,v 1.35 1996/09/13 18:58:20 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: confpars.c,v 1.36 1996/11/08 20:06:28 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 290,294 **** parse_warn ("get-lease-hostnames not allowed here."); group -> get_lease_hostnames = parse_boolean (cfile); - note ("get_lease_hostnames: %d", group -> get_lease_hostnames); break; --- 290,293 ---- *************** *** 867,877 **** switch (token) { case ETHERNET: ! hardware -> htype = ARPHRD_ETHER; break; - #ifdef ARPHRD_IEEE802 /* XXX */ case TOKEN_RING: ! hardware -> htype = ARPHRD_IEEE802; break; - #endif default: parse_warn ("expecting a network hardware type"); --- 866,874 ---- switch (token) { case ETHERNET: ! hardware -> htype = HTYPE_ETHER; break; case TOKEN_RING: ! hardware -> htype = HTYPE_IEEE802; break; default: parse_warn ("expecting a network hardware type"); diff -rc2 DHCPD-BETA-5.13/dhcp.h DHCPD-BETA-5.14/dhcp.h *** DHCPD-BETA-5.13/dhcp.h Fri Sep 13 12:06:40 1996 --- DHCPD-BETA-5.14/dhcp.h Fri Nov 8 12:29:02 1996 *************** *** 81,84 **** --- 81,88 ---- #define BOOTP_BROADCAST 32768L + /* Possible values for hardware type (htype) field... */ + #define HTYPE_ETHER 1 /* Ethernet 10Mbps */ + #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */ + /* Magic cookie validating dhcp options field (and bootp vendor extensions field). */ diff -rc2 DHCPD-BETA-5.13/dhcpd.c DHCPD-BETA-5.14/dhcpd.c *** DHCPD-BETA-5.13/dhcpd.c Fri Sep 13 12:06:44 1996 --- DHCPD-BETA-5.14/dhcpd.c Fri Nov 8 12:29:07 1996 *************** *** 49,53 **** "Copyright 1995, 1996 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCPD $Name: BETA_5_13 $"; #include "dhcpd.h" --- 49,53 ---- "Copyright 1995, 1996 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCPD $Name: BETA_5_14 $"; #include "dhcpd.h" diff -rc2 DHCPD-BETA-5.13/dispatch.c DHCPD-BETA-5.14/dispatch.c *** DHCPD-BETA-5.13/dispatch.c Fri Sep 13 12:07:29 1996 --- DHCPD-BETA-5.14/dispatch.c Fri Nov 8 12:29:53 1996 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dispatch.c,v 1.26 1996/09/11 18:53:33 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: dispatch.c,v 1.27 1996/11/08 20:06:29 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 154,158 **** (&ifp -> ifr_addr)); tmp -> hw_address.hlen = foo -> sdl_alen; ! tmp -> hw_address.htype = ARPHRD_ETHER; /* XXX */ memcpy (tmp -> hw_address.haddr, LLADDR (foo), foo -> sdl_alen); --- 154,158 ---- (&ifp -> ifr_addr)); tmp -> hw_address.hlen = foo -> sdl_alen; ! tmp -> hw_address.htype = HTYPE_ETHER; /* XXX */ memcpy (tmp -> hw_address.haddr, LLADDR (foo), foo -> sdl_alen); diff -rc2 DHCPD-BETA-5.13/errwarn.c DHCPD-BETA-5.14/errwarn.c *** DHCPD-BETA-5.13/errwarn.c Fri Sep 13 12:07:30 1996 --- DHCPD-BETA-5.14/errwarn.c Fri Nov 8 12:29:55 1996 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: errwarn.c,v 1.11 1996/09/02 21:15:27 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: errwarn.c,v 1.12 1996/11/08 20:07:31 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 77,82 **** /* Also log it to stderr? */ if (log_perror) { ! write (1, mbuf, strlen (mbuf)); ! write (1, "\n", 1); } --- 77,82 ---- /* Also log it to stderr? */ if (log_perror) { ! write (2, mbuf, strlen (mbuf)); ! write (2, "\n", 1); } *************** *** 104,109 **** if (log_perror) { ! write (1, mbuf, strlen (mbuf)); ! write (1, "\n", 1); } --- 104,109 ---- if (log_perror) { ! write (2, mbuf, strlen (mbuf)); ! write (2, "\n", 1); } *************** *** 130,135 **** if (log_perror) { ! write (1, mbuf, strlen (mbuf)); ! write (1, "\n", 1); } --- 130,135 ---- if (log_perror) { ! write (2, mbuf, strlen (mbuf)); ! write (2, "\n", 1); } *************** *** 156,161 **** if (log_perror) { ! write (1, mbuf, strlen (mbuf)); ! write (1, "\n", 1); } --- 156,161 ---- if (log_perror) { ! write (2, mbuf, strlen (mbuf)); ! write (2, "\n", 1); } *************** *** 227,236 **** if (log_perror) { ! write (1, mbuf, strlen (mbuf)); ! write (1, "\n", 1); ! write (1, token_line, strlen (token_line)); ! write (1, "\n", 1); ! write (1, spaces, lexchar - 1); ! write (1, "^\n", 2); } --- 227,236 ---- if (log_perror) { ! write (2, mbuf, strlen (mbuf)); ! write (2, "\n", 1); ! write (2, token_line, strlen (token_line)); ! write (2, "\n", 1); ! write (2, spaces, lexchar - 1); ! write (2, "^\n", 2); } diff -rc2 DHCPD-BETA-5.13/memory.c DHCPD-BETA-5.14/memory.c *** DHCPD-BETA-5.13/memory.c Fri Sep 13 12:07:37 1996 --- DHCPD-BETA-5.14/memory.c Fri Nov 8 12:30:03 1996 *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: memory.c,v 1.21 1996/08/30 20:14:03 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: memory.c,v 1.22 1996/11/08 20:09:10 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 430,433 **** --- 430,437 ---- int enter_hwaddr = 0; struct lease *lp; + + /* Static leases are not currently kept in the database... */ + if (lease -> flags & STATIC_LEASE) + return 1; /* If the existing lease hasn't expired and has a different