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 botch in determining if auth query is local.

Browse Source
This commit is contained in:
Simon Kelley
2013-10-21 21:47:03 +01:00
parent 93bafe619d
commit 6008bdbbc1
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth.c
View File

@@ -110,7 +110,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
if (ntohs(header->qdcount) == 0 || OPCODE(header) != QUERY ) if (ntohs(header->qdcount) == 0 || OPCODE(header) != QUERY )
return 0; return 0;
/* determine end of question section (we put answers there) */ /* determine end of question section (we put answers there) */
if (!(ansp = skip_questions(header, qlen))) if (!(ansp = skip_questions(header, qlen)))
return 0; /* bad packet */ return 0; /* bad packet */

30
src/forward.c
View File

@@ -865,13 +865,14 @@ void receive_query(struct listener *listen, time_t now)
#ifdef HAVE_AUTH #ifdef HAVE_AUTH
/* find queries for zones we're authoritative for, and answer them directly */ /* find queries for zones we're authoritative for, and answer them directly */
for (zone = daemon->auth_zones; zone; zone = zone->next) if (!auth_dns)
if (in_zone(zone, daemon->namebuff, NULL)) for (zone = daemon->auth_zones; zone; zone = zone->next)
{ if (in_zone(zone, daemon->namebuff, NULL))
auth_dns = 1; {
local_auth = 1; auth_dns = 1;
break; local_auth = 1;
} break;
}
#endif #endif
} }
@@ -973,13 +974,14 @@ unsigned char *tcp_request(int confd, time_t now,
#ifdef HAVE_AUTH #ifdef HAVE_AUTH
/* find queries for zones we're authoritative for, and answer them directly */ /* find queries for zones we're authoritative for, and answer them directly */
for (zone = daemon->auth_zones; zone; zone = zone->next) if (!auth_dns)
if (in_zone(zone, daemon->namebuff, NULL)) for (zone = daemon->auth_zones; zone; zone = zone->next)
{ if (in_zone(zone, daemon->namebuff, NULL))
auth_dns = 1; {
local_auth = 1; auth_dns = 1;
break; local_auth = 1;
} break;
}
#endif #endif
} }