DHCPv6: DHCPCONFIRM should be OK for any address on link, not just dynamic addresses.

diff --git a/CHANGELOG b/CHANGELOG
index ef39a415788b7b865f02a0284d9772778da1990f..9e1b5a5ab0b8129576b2904d4faa2b2a09f049d3 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -121,6 +121,11 @@ version 2.73
            Allow DHCPv4 options T1 and T2 to be set using --dhcp-option.
            Thanks to Kevin Benton for patches and work on this.
 
+            Fix code for DHCPCONFIRM DHCPv6 messages to confirm addresses
+           in the correct subnet, even of not in dynamic address 
+           allocation range. Thanks to Steve Hirsch for spotting
+           the problem.
+       
        
 version 2.72
             Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.

diff --git a/src/rfc3315.c b/src/rfc3315.c
index b4f5dd2db61fc6469282fdd479621fad46b4c0b6..2665d0d3294a478e8cd4086389d466acaeed81c2 100644 (file)
--- a/src/rfc3315.c
+++ b/src/rfc3315.c
@@ -1089,7 +1089,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
              {
                struct in6_addr *req_addr = opt6_ptr(ia_option, 0);
                
-               if (!address6_available(state->context, req_addr, tagif, 1))
+               if (!address6_valid(state->context, req_addr, tagif, 1))
                  {
                    o1 = new_opt6(OPTION6_STATUS_CODE);
                    put_opt6_short(DHCP6NOTONLINK);