- Shared network selection should be done from the innermost relay

  valid link-address field, rather than the outermost.  [ISC-Bugs #17764]

diff --git a/RELNOTES b/RELNOTES
index c33f416a009c7917fed08222a366fcb34d9b108d..7e054ad5544ec034f42fba6583c12f41e4f50cfd 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -64,6 +64,9 @@ work on other platforms. Please report any problems and suggested fixes to
 - A bug was fixed where the length of a hostname was miscalculated, so that
   hosts were given odd-looking domain names ("foo.bar.ba.example.com").
 
+- Shared network selection should be done from the innermost relay
+  valid link-address field, rather than the outermost.
+
                        Changes since 4.0.0 (new features)
 
 - Added DHCPv6 rapid commit support.

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index 1f7a3964a4e52cea1e97c785b0b89f517d62d59a..7b20d36b5ec7ed73da9424df742b8b60eef6529a 100644 (file)
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -3954,6 +3954,7 @@ shared_network_from_packet6(struct shared_network **shared,
                if (!IN6_IS_ADDR_UNSPECIFIED(link_addr) &&
                    !IN6_IS_ADDR_LINKLOCAL(link_addr)) {
                        first_link_addr = link_addr;
+                       break;
                }
                chk_packet = chk_packet->dhcpv6_container_packet;
        }