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
Fix mis-merge
[exim.git]
/
src
/
src
/
transports
/
smtp.c
diff --git
a/src/src/transports/smtp.c
b/src/src/transports/smtp.c
index 576b7c546c3a3443891f89d2cd480e0d09f7f719..7eb6abaeb45b1c9d5f177831bcff5939d0b831ad 100644
(file)
--- a/
src/src/transports/smtp.c
+++ b/
src/src/transports/smtp.c
@@
-3449,9
+3449,7
@@
sx.conn_args.interface = interface;
sx.helo_data = NULL;
sx.conn_args.tblock = tblock;
sx.verify = FALSE;
sx.helo_data = NULL;
sx.conn_args.tblock = tblock;
sx.verify = FALSE;
-#ifdef EXPERIMENTAL_PIPE_CONNECT
sx.sync_addr = sx.first_addr = addrlist;
sx.sync_addr = sx.first_addr = addrlist;
-#endif
/* Get the channel set up ready for a message (MAIL FROM being the next
SMTP command to send */
/* Get the channel set up ready for a message (MAIL FROM being the next
SMTP command to send */