summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-05-03 15:53:28 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-05-03 15:54:07 +0200
commite8ac8be0a3d56ba0a189fb970c339ac6e84769be (patch)
treef3896220b8c94fd396ea8b30b65f417a1d400e0c
parent919111edac911ba9c15422eafd7c5bf14d416d26 (diff)
downloadexim4-e8ac8be0a3d56ba0a189fb970c339ac6e84769be.tar.gz
Fix DANE + SNI handling (Bug 2265)
Broken in d8e99d6047e709b35eabb1395c2046100d1a1dda Thanks to JGH and Wolfgang Breyha for contributions.
-rw-r--r--src/src/transports/smtp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index f26e2337a..9ee6a578a 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -2015,7 +2015,7 @@ if (continue_hostname && continue_proxy_cipher)
{
case OK: sx->conn_args.dane = TRUE;
ob->tls_tempfail_tryclear = FALSE; /* force TLS */
- ob->tls_sni = sx->first_addr->domain; /* force SNI */
+ ob->tls_sni = sx->conn_args.host->name; /* force SNI */
break;
case FAIL_FORCED: break;
default: set_errno_nohost(sx->addrlist, ERRNO_DNSDEFER,
@@ -2097,7 +2097,7 @@ if (!continue_hostname)
{
case OK: sx->conn_args.dane = TRUE;
ob->tls_tempfail_tryclear = FALSE; /* force TLS */
- ob->tls_sni = sx->first_addr->domain; /* force SNI */
+ ob->tls_sni = sx->conn_args.host->name; /* force SNI */
break;
case FAIL_FORCED: break;
default: set_errno_nohost(sx->addrlist, ERRNO_DNSDEFER,