diff options
| author | Phil Pennock <pdp@exim.org> | 2012-06-06 19:51:44 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2012-06-06 19:51:44 -0400 |
| commit | ec4b68e5d820109e5954329013a911d4032bc4dc (patch) | |
| tree | 87dd12b6016ab425631efafd6d2b98ea4ec24e6a | |
| parent | 05ec18de4a052686f21343460824a1b88ab2129e (diff) | |
| parent | 2c9a0e86055f1e86ca5cdde421f5f8c9a48b0194 (diff) | |
BUGFIX: forced-fail smtp option tls_sni would dereference NULL
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/tls-openssl.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 71d239288..66fb1ca32 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -37,6 +37,9 @@ JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support. JH/02 Support "G" suffix to numbers in ${if comparisons. +PP/08 Handle smtp transport tls_sni option forced-fail for OpenSSL. + + Exim version 4.80 ----------------- diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index a8a62fe8c..64aa689fb 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -1338,7 +1338,11 @@ if (sni) { if (!expand_check(sni, US"tls_sni", &tls_out.sni)) return FAIL; - if (!Ustrlen(tls_out.sni)) + if (tls_out.sni == NULL) + { + DEBUG(D_tls) debug_printf("Setting TLS SNI forced to fail, not sending\n"); + } + else if (!Ustrlen(tls_out.sni)) tls_out.sni = NULL; else { |