X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fverify.c;h=9ff1807d4fdac01ff3b2d4551b78d2c6bae60c80;hb=d953610fa77ec9a08fad9c1a183181079a79674e;hp=9c4776b31d7f5bae87b03f865eb4c647415e2472;hpb=e1d04f48a45c9f8e8ff75610003048f8ead73219;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/verify.c b/src/src/verify.c index 9c4776b31..9ff1807d4 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -690,9 +690,9 @@ tls_retry_connection: && verify_check_given_host(&ob->hosts_require_tls, host) != OK ) { - log_write(0, LOG_MAIN, "TLS session failure:" - " callout unencrypted to %s [%s] (not in hosts_require_tls)", - host->name, host->address); + log_write(0, LOG_MAIN, + "%s: callout unencrypted to %s [%s] (not in hosts_require_tls)", + addr->message, host->name, host->address); addr->transport_return = PENDING_DEFER; yield = smtp_setup_conn(&sx, TRUE); } @@ -730,8 +730,7 @@ tls_retry_connection: sx.send_rset = TRUE; sx.completed_addr = FALSE; - new_domain_record.result = - old_domain_cache_result == ccache_reject_mfnull + new_domain_record.result = old_domain_cache_result == ccache_reject_mfnull ? ccache_reject_mfnull : ccache_accept; /* Do the random local part check first. Temporarily replace the recipient @@ -1804,7 +1803,7 @@ while (addr_new) dnssec_domains = &ob->dnssec; } - (void)host_find_bydns(host, NULL, flags, NULL, NULL, NULL, + (void) host_find_bydns(host, NULL, flags, NULL, NULL, NULL, dnssec_domains, NULL, NULL); } }