From: David Hankins <dhankins@isc.org>
Date: Fri, 7 Mar 2008 17:49:31 +0000 (+0000)
Subject: - Shared network selection should be done from the innermost relay
X-Git-Tag: v4_1_0a2~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b445a411d90eebf9cfe1867e22c9441f570b2496;p=thirdparty%2Fdhcp.git

- 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 c33f416a0..7e054ad55 100644
--- 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 1f7a3964a..7b20d36b5 100644
--- 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;
 	}