mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 13:57:50 +00:00
Code Issues Releases Wiki Activity

[master] Leave siaddr clear when sending a NAK

Browse Source
This commit is contained in:
Shawn Routhier
2015-04-16 12:04:14 -07:00
parent 90fdd3376d
commit 70689a73b4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RELNOTES
View File

@@ -105,6 +105,10 @@ by Eric Young (eay@cryptsoft.com).
or add a lease entry with a date far in the future.
[ISC-Bugs #33056]
- Leave the siaddr field clear when sending a NACK as per RFC 2131
table 3.
[ISC-Bugs #38769]
Changes since 4.3.2rc2
- None

4
server/dhcp.c
View File

@@ -3,7 +3,7 @@
DHCP Protocol engine. */
/*
* Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004-2015 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
@@ -1695,8 +1695,6 @@ void nak_lease (packet, cip, network_group)
option_state_dereference (&options, MDL);
/* memset (&raw.ciaddr, 0, sizeof raw.ciaddr);*/
if (packet->interface->address_count)
raw.siaddr = packet->interface->addresses[0];
raw.giaddr = packet -> raw -> giaddr;
memcpy (raw.chaddr, packet -> raw -> chaddr, sizeof raw.chaddr);
raw.hlen = packet -> raw -> hlen;