diff options
| author | David Hankins <dhankins@isc.org> | 2010-02-01 22:03:15 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2010-02-01 22:03:15 +0000 |
| commit | 3c941d426df34fdfee70643eb91a360f2e7b22c2 (patch) | |
| tree | 2775537de002af72b4c560e8ce9b53a78ad59e93 | |
| parent | d1f31a0065f37300ca96f57009dabc0358fbdb65 (diff) | |
| download | isc-dhcp-3c941d426df34fdfee70643eb91a360f2e7b22c2.tar.gz | |
- Cleaned up an unused hardware address variable in nak_lease().
[ISC-Bugs #15382]
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rw-r--r-- | server/dhcp.c | 22 |
2 files changed, 8 insertions, 18 deletions
@@ -40,11 +40,13 @@ work on other platforms. Please report any problems and suggested fixes to <dhcp-users@isc.org>. - Changes since 4.2.0a1 + Changes since 4.2.0a1 - When using 'ignore client-updates;', the FQDN returned to the client is no longer truncated to one octet. +- Cleaned up an unused hardware address variable in nak_lease(). + - Manpage entries for the ia-pd and ia-prefix options were updated to reflect support for prefix delegation. diff --git a/server/dhcp.c b/server/dhcp.c index 694dc451..f49cee38 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -1303,7 +1303,6 @@ void nak_lease (packet, cip) struct dhcp_packet raw; unsigned char nak = DHCPNAK; struct packet outgoing; - struct hardware hto; unsigned i; struct option_state *options = (struct option_state *)0; struct option_cache *oc = (struct option_cache *)0; @@ -1405,8 +1404,6 @@ void nak_lease (packet, cip) ? inet_ntoa (packet -> raw -> giaddr) : packet -> interface -> name); - - #ifdef DEBUG_PACKET dump_packet (packet); dump_raw ((unsigned char *)packet -> raw, packet -> packet_length); @@ -1414,13 +1411,6 @@ void nak_lease (packet, cip) dump_raw ((unsigned char *)&raw, outgoing.packet_length); #endif -#if 0 - hto.hbuf [0] = packet -> raw -> htype; - hto.hlen = packet -> raw -> hlen; - memcpy (&hto.hbuf [1], packet -> raw -> chaddr, hto.hlen); - hto.hlen++; -#endif - /* Set up the common stuff... */ to.sin_family = AF_INET; #ifdef HAVE_SA_LEN @@ -1442,10 +1432,9 @@ void nak_lease (packet, cip) to.sin_port = remote_port; /* for testing. */ if (fallback_interface) { - result = send_packet (fallback_interface, - packet, &raw, - outgoing.packet_length, - from, &to, &hto); + result = send_packet(fallback_interface, packet, &raw, + outgoing.packet_length, from, &to, + NULL); return; } } else { @@ -1454,9 +1443,8 @@ void nak_lease (packet, cip) } errno = 0; - result = send_packet (packet -> interface, - packet, &raw, outgoing.packet_length, - from, &to, (struct hardware *)0); + result = send_packet(packet->interface, packet, &raw, + outgoing.packet_length, from, &to, NULL); } void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) |