[master] Merge branch 'trac4320'

diff --cc src/bin/dhcp6/dhcp6_srv.cc
index a62018ebea2bf2344514e0597751b27d86021c18,2281af6310af38be5e52f296f8739c335aed3d14..afe3faa8f73027dd7095e8825e9af7685f8a6f6a
--- 1/src/bin/dhcp6/dhcp6_srv.cc
--- 2/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@@ -1595,12 -1593,14 +1592,12 @@@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& q
          Option6IAAddrPtr iaaddr = boost::dynamic_pointer_cast<Option6IAAddr>(it->second);
          if (!iaaddr) {
              // That's weird. Option code was ok, but the object type was not.
 -            // As we use Dhcpv6Srv::unpackOptions() that is guaranteed to use
 -            // Option6IAAddr for D6O_IAADDR, this should never happen. The only
 -            // case would be with badly mis-implemented hook libraries that
 -            // insert invalid option objects. There's no way to protect against
 -            // this.
 +            // This should never happen. The only case would be with badly
 +            // mis-implemented hook libraries that insert invalid option objects.
 +            // There's no way to protect against this.
              continue;
          }
-         ctx.hints_.push_back(make_pair(iaaddr->getAddress(), 128));
+         ctx.currentIA().addHint(iaaddr->getAddress());
      }
  
      Lease6Collection leases = alloc_engine_->renewLeases6(ctx);

diff --cc src/bin/dhcp6/dhcp6_srv.h
Simple merge

diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.h
Simple merge