From: Shawn Routhier <sar@isc.org>
Date: Fri, 11 Mar 2016 03:41:14 +0000 (-0800)
Subject: [master] Add comment and change log entry for 4292
X-Git-Tag: trac4326_base~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b7182abdc7ff47eb9b68451e7507b7e4b9872e0;p=thirdparty%2Fkea.git

[master] Add comment and change log entry for 4292
---

diff --git a/ChangeLog b/ChangeLog
index 01ad25ca02..a2704807cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1085.	[bug]		sar
+	Always copy the DHCPv4 flags field from a client's request to the
+	the server's resposne.
+	(Trac #4292, git <tbd>)
+
 1084.	[bug]		fdupont
 	Removed obsolete requirement of python3 by --enable-generate-docs
 	configuration option.
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 2209df4e2d..22fd8712eb 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -199,6 +199,7 @@ Dhcpv4Exchange::copyDefaultFields() {
         resp_->setRemoteHWAddr(dst_hw_addr);
     }
 
+    // Copy flags from the request to the response per RFC 2131
     resp_->setFlags(query_->getFlags());
 }