[exim-cvs] Fix mis-merge

Kezdőlap
Üzenet törlése
Válasz az üzenetre
Szerző: Exim Git Commits Mailing List
Dátum:  
Címzett: exim-cvs
Tárgy: [exim-cvs] Fix mis-merge
Gitweb: https://git.exim.org/exim.git/commitdiff/7aea90739de0e2808109321c6733451e8cb5cfcb
Commit:     7aea90739de0e2808109321c6733451e8cb5cfcb
Parent:     d070b1356df7e5fea393f5f527fad9c00a0424e9
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Nov 5 18:26:18 2018 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Nov 5 18:26:18 2018 +0000


    Fix mis-merge


    Broken-by ee8b809061
---
 src/src/transports/smtp.c | 2 --
 1 file changed, 2 deletions(-)


diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 576b7c5..7eb6aba 100644
--- 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;
-#ifdef EXPERIMENTAL_PIPE_CONNECT
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 */