Merge remote-tracking branch 'origin/1518-unable-to-add-multiple-sub-options-to-vivso...

diff --cc src/bin/dhcp6/dhcp6_srv.cc
index 79f89e41237695afb5ce296dfc75b43691ba82d0,b978c979ce437aefa8f3d31a7bd007a8ebfcf3bf..566ddfded08680c5e7de6406e2999baeba7c973e
--- 1/src/bin/dhcp6/dhcp6_srv.cc
--- 2/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)) {

diff --cc src/bin/dhcp6/tests/vendor_opts_unittest.cc
Simple merge