Merge branch 'master' into dnssec

CHANGELOG

@@ -27,6 +27,11 @@ version 2.68
 	    DHCP ranges, probably with a trailing "/6" like this: 
 	    --auth-zone=example.com,eth0/6 to limit the addresses to
 	    IPv6 addresses of eth0.
+
+	    Fix problems when advertising deleted IPv6 prefixes. If
+	    the prefix is deleted (rather than replaced), it doesn't
+	    get advertised with zero preferred time. Thanks to Tsachi
+	    for the bug report. 
  
 
 version 2.67

src/radv.c

@@ -597,7 +597,7 @@ time_t periodic_ra(time_t now)
       
       if ((context->flags & CONTEXT_OLD) && 
 	  context->if_index != 0 && 
-	  indextoname(daemon->icmp6fd, param.iface, param.name))
+	  indextoname(daemon->icmp6fd, context->if_index, param.name))
 	{
 	  /* A context for an old address. We'll not find the interface by 
 	     looking for addresses, but we know it anyway, since the context is