From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 9 May 2012 17:51:31 +0000 (+0100)
Subject: Merge branch 'master' of git://git.exim.org/exim
X-Git-Tag: exim-4_80_RC1~31
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/bbaa92096a0720af1625982d024befac65d5909e?hp=9ee44efbe7474892e931cd517195cb690e765ab6

Merge branch 'master' of git://git.exim.org/exim
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 4db67f871..6ec94d5da 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -895,7 +895,7 @@ outblock.authenticating = FALSE;
 tls_bits = 0;
 tls_cipher = NULL;
 tls_peerdn = NULL;
-#ifndef USE_GNUTLS
+#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS)
 tls_sni = NULL;
 #endif