[master] Add comment and change log entry for 4292

diff --git a/ChangeLog b/ChangeLog
index 01ad25ca0270fecc84b749a70708eb4d29be2ad5..a2704807cc6a03cdf87a458b3deae1287cbec256 100644 (file)
--- 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 2209df4e2dd06e5564cc77c238ab2a0742dcc199..22fd8712ebe54333906f166567bc293512fc8a85 100644 (file)
--- 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());
 }