From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 10 Mar 2023 15:48:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/1518-unable-to-add-multiple-sub-options-to-vivso... 
X-Git-Tag: Kea-2.3.6~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be552b4d7ed7961437040eb0450306961799ec8;p=thirdparty%2Fkea.git

Merge remote-tracking branch 'origin/1518-unable-to-add-multiple-sub-options-to-vivso-suboptions-20314bf68ded4cd7' into HEAD
---

3be552b4d7ed7961437040eb0450306961799ec8
diff --cc src/bin/dhcp6/dhcp6_srv.cc
index 79f89e4123,b978c979ce..566ddfded0
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@@ -1520,10 -1512,10 +1512,10 @@@ Dhcpv6Srv::appendRequestedOptions(cons
  
      // For each requested option code get the first instance of the option
      // to be returned to the client.
-     for (uint16_t opt : requested_opts) {
+     for (auto const& opt : requested_opts) {
          // Add nothing when it is already there.
 -        // Skip special cases: D6O_VENDOR_CLASS and D6O_VENDOR_OPTS
 -        if (opt == D6O_VENDOR_CLASS || opt == D6O_VENDOR_OPTS) {
 +        // Skip special cases: D6O_VENDOR_OPTS
 +        if (opt == D6O_VENDOR_OPTS) {
              continue;
          }
          if (!answer->getOption(opt)) {