git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[users/jgh/exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index a1a70c718f9107e4cfe9b7dcc1a4641f0d9d1fb6..2feaf957b6462f26497452fc6c18c0a3a7472b11 100644
(file)
--- 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;
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)
blob reqstr;
if (expand_forbid & RDO_READSOCK)
@@
-4934,8
+4932,9
@@
while (*s != 0)
do_tls ? NULL : &reqstr);
callout_address = NULL;
if (fd < 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 */
}
/* Handle a Unix domain socket */