Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patchlevel 20 fixes

Browse Source
This commit is contained in:
mellon 1999-03-30 00:10:08 +00:00
parent 579e9efdc7
commit 4f34fd30b5
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/dhcp/common/icmp.c
View File

@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
"$Id: icmp.c,v 1.1.1.5 1999/02/18 21:48:50 mellon Exp $ Copyright (c) 1997, 1998 The Internet Software Consortium. All rights reserved.\n";
"$Id: icmp.c,v 1.1.1.6 1999/03/30 00:10:08 mellon Exp $ Copyright (c) 1997, 1998 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@ -61,8 +61,6 @@ void icmp_startup (routep, handler)
{
struct protoent *proto;
int protocol = 1;
struct sockaddr_in from;
int fd;
int state;
/* Only initialize icmp once. */

2
usr.sbin/dhcp/common/inet.c
View File

@ -114,7 +114,7 @@ struct iaddr broadcast_addr (subnet, mask)
struct iaddr subnet;
struct iaddr mask;
{
int i, j, k;
int i;
struct iaddr rv;
if (subnet.len != mask.len) {

10
usr.sbin/dhcp/common/options.c
View File

@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
"$Id: options.c,v 1.1.1.7 1999/03/29 23:00:52 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n";
"$Id: options.c,v 1.1.1.8 1999/03/30 00:10:09 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#define DHCP_OPTION_DATA
@ -135,7 +135,7 @@ void parse_option_buffer (packet, buffer, length)
for clients, but what the heck... */
t = ((unsigned char *)
dmalloc (len + packet -> options [code].len + 1,
"parse_option_buffer");
"parse_option_buffer"));
if (!t)
error ("Can't expand storage for option %s.",
dhcp_options [code].name);
@ -605,6 +605,7 @@ void do_packet (interface, packet, len, from_port, from, hfrom)
struct hardware *hfrom;
{
struct packet tp;
int i;
if (packet -> hlen > sizeof packet -> chaddr) {
note ("Discarding packet with invalid hlen.");
@ -631,9 +632,8 @@ void do_packet (interface, packet, len, from_port, from, hfrom)
/* Free the data associated with the options. */
for (i = 0; i < 256; i++) {
if (packet -> options [i].len &&
packet -> options [i].data)
dfree (packet -> options [i].data, "do_packet");
if (tp.options [i].len && tp.options [i].data)
dfree (tp.options [i].data, "do_packet");
}
}