From: Shawn Routhier <sar@isc.org>
Date: Thu, 16 Apr 2015 19:04:14 +0000 (-0700)
Subject: [master] Leave siaddr clear when sending a NAK
X-Git-Tag: v4_3_3b1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70689a73b4abe2ac6982463e6cb279683cefe19c;p=thirdparty%2Fdhcp.git

[master] Leave siaddr clear when sending a NAK
---

diff --git a/RELNOTES b/RELNOTES
index 9407ed86e..04fada633 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -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 317060599..41f4c61c9 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;