commit 8c707e1e377eb2eb88a94518757750b6f1e261bf
author Simon Kelley <simon@thekelleys.org.uk> Tue Dec 05 22:28:10 2017 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Tue Dec 05 22:28:10 2017 +0000
tree 360c09d9300dd79f456d8494b7a067a081f20406
parent 373e91738929a3d416e6292e65824184ba8428a6

Make 373e91738929a3d416e6292e65824184ba8428a6 compile without DNSSEC.

src/rfc1035.c

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