summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-07-08 13:54:53 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2014-07-08 13:54:53 +0100
commit4b57b15d12942aff5360105a71f9c1b9d9a4edaf (patch)
treeb67a1591aa17ba62dacf648ffe6b54c83ea89ab5
parentf182293e3a29c4433816803268350f6c2797a3e0 (diff)
Reinstate SNI variables under GnuTLS. Bug 1499exim-4_83_RC3
-rw-r--r--src/src/expand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/src/expand.c b/src/src/expand.c
index 9d73803a5..c0edef651 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -677,7 +677,7 @@ static var_entry var_table[] = {
{ "tls_in_ourcert", vtype_cert, &tls_in.ourcert },
{ "tls_in_peercert", vtype_cert, &tls_in.peercert },
{ "tls_in_peerdn", vtype_stringptr, &tls_in.peerdn },
-#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS)
+#if defined(SUPPORT_TLS)
{ "tls_in_sni", vtype_stringptr, &tls_in.sni },
#endif
{ "tls_out_bits", vtype_int, &tls_out.bits },
@@ -687,12 +687,12 @@ static var_entry var_table[] = {
{ "tls_out_ourcert", vtype_cert, &tls_out.ourcert },
{ "tls_out_peercert", vtype_cert, &tls_out.peercert },
{ "tls_out_peerdn", vtype_stringptr, &tls_out.peerdn },
-#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS)
+#if defined(SUPPORT_TLS)
{ "tls_out_sni", vtype_stringptr, &tls_out.sni },
#endif
{ "tls_peerdn", vtype_stringptr, &tls_in.peerdn }, /* mind the alphabetical order! */
-#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS)
+#if defined(SUPPORT_TLS)
{ "tls_sni", vtype_stringptr, &tls_in.sni }, /* mind the alphabetical order! */
#endif