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

Fix auth-DNS filtering problems with contructed ranges.

Browse Source
This commit is contained in:
Simon Kelley
2012-12-30 17:54:04 +00:00
parent 771287be11
commit 355736f36f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/auth.c
View File

@@ -46,7 +46,7 @@ static struct subnet *filter_zone(struct auth_zone *zone, int flag, struct all_a
return NULL; return NULL;
} }
static int filter_constructed_dhcp(int flag, struct all_addr *addr_u) static int filter_constructed_dhcp(struct auth_zone *zone, int flag, struct all_addr *addr_u)
{ {
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
struct dhcp_context *context; struct dhcp_context *context;
@@ -58,7 +58,7 @@ static int filter_constructed_dhcp(int flag, struct all_addr *addr_u)
return 1; return 1;
#endif #endif
return 0; return filter_zone(zone, flag, addr_u) != NULL;
} }
static int in_zone(struct auth_zone *zone, char *name, char **cut) static int in_zone(struct auth_zone *zone, char *name, char **cut)
@@ -431,7 +431,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
{ {
nxdomain = 0; nxdomain = 0;
if ((crecp->flags & flag) && if ((crecp->flags & flag) &&
(filter_zone(zone, flag, &(crecp->addr.addr)) || filter_constructed_dhcp(flag, &(crecp->addr.addr)))) (filter_constructed_dhcp(zone, flag, &(crecp->addr.addr))))
{ {
*cut = '.'; /* restore domain part */ *cut = '.'; /* restore domain part */
log_query(crecp->flags, name, &crecp->addr.addr, record_source(crecp->uid)); log_query(crecp->flags, name, &crecp->addr.addr, record_source(crecp->uid));
@@ -454,7 +454,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
do do
{ {
nxdomain = 0; nxdomain = 0;
if ((crecp->flags & flag) && filter_zone(zone, flag, &(crecp->addr.addr))) if ((crecp->flags & flag) && filter_constructed_dhcp(zone, flag, &(crecp->addr.addr)))
{ {
log_query(crecp->flags, name, &crecp->addr.addr, record_source(crecp->uid)); log_query(crecp->flags, name, &crecp->addr.addr, record_source(crecp->uid));
found = 1; found = 1;
@@ -679,7 +679,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
if ((crecp->flags & F_DHCP) && !option_bool(OPT_DHCP_FQDN)) if ((crecp->flags & F_DHCP) && !option_bool(OPT_DHCP_FQDN))
{ {
char *cache_name = cache_get_name(crecp); char *cache_name = cache_get_name(crecp);
if (!strchr(cache_name, '.') && filter_zone(zone, (crecp->flags & (F_IPV6 | F_IPV4)), &(crecp->addr.addr))) if (!strchr(cache_name, '.') && filter_constructed_dhcp(zone, (crecp->flags & (F_IPV6 | F_IPV4)), &(crecp->addr.addr)))
{ {
qtype = T_A; qtype = T_A;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@@ -696,7 +696,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
if ((crecp->flags & F_HOSTS) || (((crecp->flags & F_DHCP) && option_bool(OPT_DHCP_FQDN)))) if ((crecp->flags & F_HOSTS) || (((crecp->flags & F_DHCP) && option_bool(OPT_DHCP_FQDN))))
{ {
strcpy(name, cache_get_name(crecp)); strcpy(name, cache_get_name(crecp));
if (in_zone(zone, name, &cut) && filter_zone(zone, (crecp->flags & (F_IPV6 | F_IPV4)), &(crecp->addr.addr))) if (in_zone(zone, name, &cut) && filter_constructed_dhcp(zone, (crecp->flags & (F_IPV6 | F_IPV4)), &(crecp->addr.addr)))
{ {
qtype = T_A; qtype = T_A;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6