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
tidying
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index 7127518e2c1df84af330f04d819279d6b5f8f258..68152d50539fa2f58e9f5c6773d22dac7b94a2b8 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-8531,7
+8531,7
@@
uschar * where;
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
{
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
{
- int
pfd[2], channel_fd = cutthrough.cctx.sock, pid
;
+ int
channel_fd = cutthrough.cctx.sock
;
smtp_peer_options = cutthrough.peer_options;
continue_sequence = 0;
smtp_peer_options = cutthrough.peer_options;
continue_sequence = 0;
@@
-8539,6
+8539,8
@@
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
#ifdef SUPPORT_TLS
if (cutthrough.is_tls)
{
#ifdef SUPPORT_TLS
if (cutthrough.is_tls)
{
+ int pfd[2], pid;
+
smtp_peer_options |= OPTION_TLS;
sending_ip_address = cutthrough.snd_ip;
sending_port = cutthrough.snd_port;
smtp_peer_options |= OPTION_TLS;
sending_ip_address = cutthrough.snd_ip;
sending_port = cutthrough.snd_port;