[master] Leave siaddr clear when sending a NAK

diff --git a/RELNOTES b/RELNOTES
index 9407ed86e7f041f0e6ca83fc8ddb6637395489b3..04fada6334ea3b3585c385436ccb73b0d23ef2a6 100644 (file)
--- 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 31706059981f0f4c20b8ac70699142ca1fc6b638..41f4c61c9fddeb2fa0a87f6b565ca288700c0a36 100644 (file)
--- 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;