git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add $tls_in_* variables; note the old names as deprecated.
[exim.git]
/
src
/
src
/
tls-gnu.c
diff --git
a/src/src/tls-gnu.c
b/src/src/tls-gnu.c
index f8172e76b0398639ed29b2c1a3c23ad364803625..c582af79f0c43472c434e6881c1ae9e666005fbc 100644
(file)
--- a/
src/src/tls-gnu.c
+++ b/
src/src/tls-gnu.c
@@
-649,7
+649,11
@@
if (!state->host)
{
if (!state->received_sni)
{
{
if (!state->received_sni)
{
- if (state->tls_certificate && Ustrstr(state->tls_certificate, US"tls_sni"))
+ if (state->tls_certificate &&
+ (Ustrstr(state->tls_certificate, US"tls_sni") ||
+ Ustrstr(state->tls_certificate, US"tls_in_sni") ||
+ Ustrstr(state->tls_certificate, US"tls_out_sni")
+ ))
{
DEBUG(D_tls) debug_printf("We will re-expand TLS session files if we receive SNI.\n");
state->trigger_sni_changes = TRUE;
{
DEBUG(D_tls) debug_printf("We will re-expand TLS session files if we receive SNI.\n");
state->trigger_sni_changes = TRUE;
@@
-966,7
+970,7
@@
if (rc != OK) return rc;
/* set SNI in client, only */
if (host)
{
/* set SNI in client, only */
if (host)
{
- if (!expand_check(state->tlsp->sni, "tls_sni", &state->exp_tls_sni))
+ if (!expand_check(state->tlsp->sni, "tls_
out_
sni", &state->exp_tls_sni))
return DEFER;
if (state->exp_tls_sni && *state->exp_tls_sni)
{
return DEFER;
if (state->exp_tls_sni && *state->exp_tls_sni)
{