X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fexpand.c;h=2feaf957b6462f26497452fc6c18c0a3a7472b11;hp=a1a70c718f9107e4cfe9b7dcc1a4641f0d9d1fb6;hb=4833456868dd4370c3ab5c79dc1e1812dbb8a36d;hpb=590795f4282e84ce9c2730bb17c7e6bb23615966

diff --git a/src/src/expand.c b/src/src/expand.c
index a1a70c718..2feaf957b 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4826,10 +4826,8 @@ while (*s != 0)
       uschar * server_name = NULL;
       host_item host;
       BOOL do_shutdown = TRUE;
-#ifdef SUPPORT_TLS
-      BOOL do_tls = FALSE;
-      void * tls_ctx = NULL;
-#endif
+      BOOL do_tls = FALSE;	/* Only set under SUPPORT_TLS */
+      void * tls_ctx = NULL;	/* ditto		      */
       blob reqstr;
 
       if (expand_forbid & RDO_READSOCK)
@@ -4934,8 +4932,9 @@ while (*s != 0)
 		  do_tls ? NULL : &reqstr);
 	  callout_address = NULL;
 	  if (fd < 0)
-              goto SOCK_FAIL;
-	  if (!do_tls) reqstr.len = 0;
+	    goto SOCK_FAIL;
+	  if (!do_tls)
+	    reqstr.len = 0;
           }
 
         /* Handle a Unix domain socket */