mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-10-26 12:24:42 +00:00
Fix access control when DHCPv6 but no RA in use.
This commit is contained in:
1 parent
9f7f3b1216
commit
51931b888a
3 files changed
+6
-4
No files matched your search
+3
-2
@@ -407,10 +407,11 @@ static int join_multicast_worker(struct in6_addr *local, int prefix,
|
||||
return 1;
|
||||
|
||||
/* 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)
|
||||
break;
|
||||
|
||||
|
||||
if (!context)
|
||||
return 1;
|
||||
|
||||
|
||||
+1
-1
@@ -2952,7 +2952,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
|
||||
|
||||
if (!atoi_check(comma, &val) ||
|
||||
!(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");
|
||||
break;
|
||||
|
||||
+2
-1
@@ -158,7 +158,8 @@ void icmp6_packet(void)
|
||||
return;
|
||||
|
||||
/* 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)
|
||||
break;
|
||||
|
||||
|
||||
Reference in new issue
Block a user