From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 29 Aug 2014 10:37:56 +0000 (+0100)
Subject: Fix tpda tcp:connect testcase
X-Git-Tag: exim-4_85_RC1~71
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/430f98cb1e35e925f6b3ca54375411ff67e8895b

Fix tpda tcp:connect testcase
---

diff --git a/test/confs/5700 b/test/confs/5700
index 65a1b59ba..0e9fd1d3f 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -22,7 +22,7 @@ begin acl
 
 ev_tcp:
     accept condition = ${if eq {$tpda_event}{tcp:connect}}
-	   logwrite = . [$host_address]:$sending_port
+	   logwrite = . [$host_address]:$host_port
     accept condition = ${if eq {$tpda_event}{tcp:close}}
 	   logwrite = . [$sending_ip_address] -> \
 			[$host_address]:$host_port
diff --git a/test/log/5700 b/test/log/5700
index 2bebd8cff..7f5712983 100644
--- a/test/log/5700
+++ b/test/log/5700
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
 1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmaY-0005vi-00 . [127.0.0.1]:-1
+1999-03-02 09:44:33 10HmaY-0005vi-00 . [127.0.0.1]:1111
 1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:connect
 1999-03-02 09:44:33 10HmaY-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
 1999-03-02 09:44:33 10HmaY-0005vi-00 . banner <220 ESMTP>
@@ -17,7 +17,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
 1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1]:-1
+1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1]:1111
 1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect
 1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
 1999-03-02 09:44:33 10HmaX-0005vi-00 . banner <220 ESMTP>
@@ -33,7 +33,7 @@
 1999-03-02 09:44:33 End queue run: pid=pppp -qqf
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmaZ-0005vi-00 . [127.0.0.1]:-1
+1999-03-02 09:44:33 10HmaZ-0005vi-00 . [127.0.0.1]:1111
 1999-03-02 09:44:33 10HmaZ-0005vi-00 event smtp:connect
 1999-03-02 09:44:33 10HmaZ-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
 1999-03-02 09:44:33 10HmaZ-0005vi-00 . banner <220 ESMTP>
@@ -55,7 +55,7 @@
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
 1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmbB-0005vi-00 . [127.0.0.1]:-1
+1999-03-02 09:44:33 10HmbB-0005vi-00 . [127.0.0.1]:1111
 1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:connect
 1999-03-02 09:44:33 10HmbB-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
 1999-03-02 09:44:33 10HmbB-0005vi-00 . banner <220 ESMTP>