Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dnssec

Browse Source
This commit is contained in:
Simon Kelley
2013-11-15 11:29:21 +00:00
parent 06e54b823e dd9d9ce54c
commit e597dba7ec
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -27,6 +27,11 @@ version 2.68
DHCP ranges, probably with a trailing "/6" like this: DHCP ranges, probably with a trailing "/6" like this:
--auth-zone=example.com,eth0/6 to limit the addresses to --auth-zone=example.com,eth0/6 to limit the addresses to
IPv6 addresses of eth0. 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 version 2.67

2
src/radv.c
View File

@@ -597,7 +597,7 @@ time_t periodic_ra(time_t now)
if ((context->flags & CONTEXT_OLD) && if ((context->flags & CONTEXT_OLD) &&
context->if_index != 0 && 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 /* 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 looking for addresses, but we know it anyway, since the context is