summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2015-05-22 18:32:04 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2015-05-22 18:32:04 +0100
commit6aa849d3880096db053d1871e33a79e43571ab18 (patch)
treed162e3c8d2629090e06833b7607349931dc48f6e /src
parent4cea764f3d43217b9b7046310fc1567c4d63c01e (diff)
DANE: do not fail/defer message due to TLSA lookup but dane is only requested
Diffstat (limited to 'src')
-rw-r--r--src/src/transports/smtp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 477e7b3bf..e6f4da8ca 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1198,10 +1198,7 @@ switch (dns_lookup(dnsa, buffer, T_TLSA, &fullname))
default:
case DNS_FAIL:
if (dane_required)
- {
- log_write(0, LOG_MAIN, "DANE error: TLSA lookup failed");
return FAIL;
- }
break;
case DNS_SUCCEED:
@@ -1467,6 +1464,7 @@ if (continue_hostname == NULL)
|| verify_check_given_host(&ob->hosts_try_dane, host) == OK
)
&& (rc = tlsa_lookup(host, &tlsa_dnsa, dane_required, &dane)) != OK
+ && dane_required
)
{
set_errno(addrlist, ERRNO_DNSDEFER,