Merge branch 'CHUNKING'

[exim.git] / src / src / transports / smtp.c

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 25e493433e54c347b55eeb2cf876e4738d2500ff..52b2b913f4fde5eb99e835ceb27c17189145b727 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1223,7 +1223,8 @@ switch (dns_lookup(dnsa, buffer, T_TLSA, &fullname))
   case DNS_AGAIN:
     return DEFER; /* just defer this TLS'd conn */
 
   case DNS_AGAIN:
     return DEFER; /* just defer this TLS'd conn */
 

-  case DNS_NOMATCH:
+  case DNS_NODATA:     /* no TLSA RR for this lookup */
+  case DNS_NOMATCH:    /* no records at all for this lookup */

     return dane_required ? FAIL : FAIL_FORCED;
 
   default:
     return dane_required ? FAIL : FAIL_FORCED;
 
   default:


@@ -2483,7 +2484,7 @@ else
     | (tblock->headers_only    ? topt_no_body : 0)
     | (tblock->return_path_add ? topt_add_return_path : 0)
     | (tblock->delivery_date_add ? topt_add_delivery_date : 0)
     | (tblock->headers_only    ? topt_no_body : 0)
     | (tblock->return_path_add ? topt_add_return_path : 0)
     | (tblock->delivery_date_add ? topt_add_delivery_date : 0)

-    | (tblock->envelope_to_add ? topt_add_envelope_to : 0),
+    | (tblock->envelope_to_add ? topt_add_envelope_to : 0)

   };
 
   /* If using CHUNKING we need a callback from the generic transport
   };
 
   /* If using CHUNKING we need a callback from the generic transport