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

Make 373e917389 compile without DNSSEC.

Browse Source
This commit is contained in:
Simon Kelley
2017-12-05 22:28:10 +00:00
parent 373e917389
commit 8c707e1e37
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rfc1035.c
View File

@@ -610,10 +610,12 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t
{ {
if (secure) if (secure)
return 0; return 0;
#ifdef HAVE_DNSSEC
if (option_bool(OPT_DNSSEC_VALID)) if (option_bool(OPT_DNSSEC_VALID))
for (i = 0; i < ntohs(header->ancount); i++) for (i = 0; i < ntohs(header->ancount); i++)
if (daemon->rr_status[i]) if (daemon->rr_status[i])
return 0; return 0;
#endif
} }
} }
@@ -625,7 +627,9 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t
int found = 0, cname_count = CNAME_CHAIN; int found = 0, cname_count = CNAME_CHAIN;
struct crec *cpp = NULL; struct crec *cpp = NULL;
int flags = RCODE(header) == NXDOMAIN ? F_NXDOMAIN : 0; int flags = RCODE(header) == NXDOMAIN ? F_NXDOMAIN : 0;
#ifdef HAVE_DNSSEC
int cname_short = 0; int cname_short = 0;
#endif
unsigned long cttl = ULONG_MAX, attl; unsigned long cttl = ULONG_MAX, attl;
namep = p; namep = p;
@@ -681,7 +685,7 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t
{ {
if (!extract_name(header, qlen, &p1, name, 1, 0)) if (!extract_name(header, qlen, &p1, name, 1, 0))
return 0; return 0;
#ifdef HAVE_DNSSEC
if (option_bool(OPT_DNSSEC_VALID) && daemon->rr_status[j]) if (option_bool(OPT_DNSSEC_VALID) && daemon->rr_status[j])
{ {
/* validated RR anywhere in CNAME chain, don't cache. */ /* validated RR anywhere in CNAME chain, don't cache. */
@@ -690,12 +694,15 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t
secflag = F_DNSSECOK; secflag = F_DNSSECOK;
} }
#endif
if (aqtype == T_CNAME) if (aqtype == T_CNAME)
{ {
if (!cname_count--) if (!cname_count--)
return 0; /* looped CNAMES, we can't cache. */ return 0; /* looped CNAMES, we can't cache. */
#ifdef HAVE_DNSSEC
cname_short = 1; cname_short = 1;
#endif
goto cname_loop; goto cname_loop;
} }