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

Fix access control when DHCPv6 but no RA in use.

Browse Source
This commit is contained in:
Simon Kelley
2012-05-29 17:06:02 +01:00
parent 9f7f3b1216
commit 51931b888a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dhcp-common.c
View File

@@ -407,10 +407,11 @@ static int join_multicast_worker(struct in6_addr *local, int prefix,
return 1; return 1;
/* weird libvirt-inspired access control */ /* weird libvirt-inspired access control */
for (context = daemon->ra_contexts; context; context = context->next) for (context = daemon->ra_contexts ? daemon->ra_contexts : daemon->dhcp6;
context; context = context->next)
if (!context->interface || strcmp(context->interface, ifrn_name) == 0) if (!context->interface || strcmp(context->interface, ifrn_name) == 0)
break; break;
if (!context) if (!context)
return 1; return 1;

2
src/option.c
View File

@@ -2952,7 +2952,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
if (!atoi_check(comma, &val) || if (!atoi_check(comma, &val) ||
!(new->name = canonicalise_opt(arg)) || !(new->name = canonicalise_opt(arg)) ||
(data && (len = parse_hex(data, (unsigned char *)data, -1, NULL, NULL)) == -1)) (data && (len = parse_hex(data, (unsigned char *)data, -1, NULL, NULL)) == -1U))
{ {
problem = _("bad RR record"); problem = _("bad RR record");
break; break;

3
src/radv.c
View File

@@ -158,7 +158,8 @@ void icmp6_packet(void)
return; return;
/* weird libvirt-inspired access control */ /* weird libvirt-inspired access control */
for (context = daemon->ra_contexts; context; context = context->next) for (context = daemon->ra_contexts ? daemon->ra_contexts : daemon->dhcp6;
context; context = context->next)
if (!context->interface || strcmp(context->interface, interface) == 0) if (!context->interface || strcmp(context->interface, interface) == 0)
break; break;