diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-05-21 23:22:16 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-05-21 23:30:57 +0100 |
| commit | 4cea764f3d43217b9b7046310fc1567c4d63c01e (patch) | |
| tree | 4ad62b47f0a9a384b0be5632732b1990a9dbafa3 /src | |
| parent | da830d08f8803b3871bd84f33a09b01c8be1e902 (diff) | |
Fix DANE for multiple-MX when all TLSA lookup defer. Bug 1634
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/dns.c | 2 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/src/dns.c b/src/src/dns.c index 6358eada6..4ca349cd1 100644 --- a/src/src/dns.c +++ b/src/src/dns.c @@ -137,7 +137,7 @@ if (stat(CS utilname, &statbuf) >= 0) } else { - DEBUG(D_dns) debug_printf("fakens (%s) not found\n", utilname); + DEBUG(D_dns) debug_printf("fakens (%s) not found\n", utilname); } /* fakens utility not found, or it returned "pass on" */ diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 986fcee6f..477e7b3bf 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1468,12 +1468,20 @@ if (continue_hostname == NULL) ) && (rc = tlsa_lookup(host, &tlsa_dnsa, dane_required, &dane)) != OK ) - return rc; + { + set_errno(addrlist, ERRNO_DNSDEFER, + string_sprintf("DANE error: tlsa lookup %s", + rc == DEFER ? "DEFER" : "FAIL"), + rc, FALSE, NULL); + return rc; + } } else if (dane_required) { - log_write(0, LOG_MAIN, "DANE error: %s lookup not DNSSEC", host->name); - return FAIL; + set_errno(addrlist, ERRNO_DNSDEFER, + string_sprintf("DANE error: %s lookup not DNSSEC", host->name), + FAIL, FALSE, NULL); + return FAIL; } if (dane) @@ -3690,16 +3698,12 @@ for (cutoff_retry = 0; expired && case, see if any of them are deferred. */ if (rc == OK) - { - for (addr = addrlist; addr != NULL; addr = addr->next) - { + for (addr = addrlist; addr; addr = addr->next) if (addr->transport_return == DEFER) { some_deferred = TRUE; break; } - } - } /* If no addresses deferred or the result was ERROR, return. We do this for ERROR because a failing filter set-up or add_headers expansion is likely to |