X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6f4d5ad3a1613f7d4502bb81eb3f4e875a71b0c9..7cd171b76e5bd3cb825c2a8720bc1fe4ad9b37e0:/src/src/verify.c

diff --git a/src/src/verify.c b/src/src/verify.c
index 93ab9112d..10cef82f1 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -2076,18 +2076,17 @@ while (addr_new != NULL)
                 (void)host_find_byname(host, NULL, flags, NULL, TRUE);
               else
 		{
-		uschar * d_request = NULL, * d_require = NULL;
+		dnssec_domains * dnssec_domains = NULL;
 		if (Ustrcmp(addr->transport->driver_name, "smtp") == 0)
 		  {
 		  smtp_transport_options_block * ob =
 		      (smtp_transport_options_block *)
 			addr->transport->options_block;
-		  d_request = ob->dnssec_request_domains;
-		  d_require = ob->dnssec_require_domains;
+		  dnssec_domains = &ob->dnssec;
 		  }
 
                 (void)host_find_bydns(host, NULL, flags, NULL, NULL, NULL,
-		  d_request, d_require, NULL, NULL);
+		  dnssec_domains, NULL, NULL);
 		}
               }
             }
@@ -2364,7 +2363,6 @@ for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
         while (len++ < maxaddlen) fprintf(f," ");
         if (h->mx >= 0) fprintf(f, "MX=%d", h->mx);
         if (h->port != PORT_NONE) fprintf(f, " port=%d", h->port);
-        if (running_in_test_harness)
 #ifndef DISABLE_DNSSEC
           fprintf(f, " ad=%s", h->dnssec==DS_YES ? "yes" : "no");
 #else
@@ -3620,13 +3618,13 @@ if (t == NULL)
     dns_record *rr;
     dns_address **addrp = &(cb->rhs);
     for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
-         rr != NULL;
+         rr;
          rr = dns_next_rr(&dnsa, &dnss, RESET_NEXT))
       {
       if (rr->type == T_A)
         {
         dns_address *da = dns_address_from_rr(&dnsa, rr);
-        if (da != NULL)
+        if (da)
           {
           *addrp = da;
           while (da->next != NULL) da = da->next;