diff options
| author | Shawn Routhier <sar@isc.org> | 2015-04-16 12:04:14 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2015-04-16 12:04:14 -0700 |
| commit | 70689a73b4abe2ac6982463e6cb279683cefe19c (patch) | |
| tree | 3325de16f1ab71730976de0baa13ea125530ca60 | |
| parent | 90fdd3376df92350c6a01a486786c66120217e11 (diff) | |
| download | isc-dhcp-70689a73b4abe2ac6982463e6cb279683cefe19c.tar.gz | |
[master] Leave siaddr clear when sending a NAK
| -rw-r--r-- | RELNOTES | 4 | ||||
| -rw-r--r-- | server/dhcp.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -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 diff --git a/server/dhcp.c b/server/dhcp.c index 31706059..41f4c61c 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -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; |