From: Jeremy Harris Date: Fri, 17 Jun 2022 19:37:44 +0000 (+0100) Subject: Testsuite: pid & port numbers X-Git-Tag: exim-4.97-RC0~282^2~4 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/3bfdf0f1f1d7a1bb6e9c3e4c6af8d1117dd13955 Testsuite: pid & port numbers --- diff --git a/test/log/4211 b/test/log/4211 index 851fc3a2b..137f0def7 100644 --- a/test/log/4211 +++ b/test/log/4211 @@ -3,15 +3,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4213 b/test/log/4213 index e3c1d77b1..5dbfad5a3 100644 --- a/test/log/4213 +++ b/test/log/4213 @@ -4,10 +4,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qfl +1999-03-02 09:44:33 Start queue run: pid=p1234 -qfl 1999-03-02 09:44:33 10HmaY-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qfl +1999-03-02 09:44:33 End queue run: pid=p1234 -qfl ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4214 b/test/log/4214 index 712faabe9..d5346e8ec 100644 --- a/test/log/4214 +++ b/test/log/4214 @@ -8,14 +8,14 @@ 1999-03-02 09:44:33 U=CALLER F= rejected RCPT : 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> rejected RCPT : relay not permitted 1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4215 b/test/log/4215 index baefd369f..22487cab5 100644 --- a/test/log/4215 +++ b/test/log/4215 @@ -3,9 +3,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4216 b/test/log/4216 index 5c03370ce..a9e527426 100644 --- a/test/log/4216 +++ b/test/log/4216 @@ -10,14 +10,14 @@ 1999-03-02 09:44:33 U=CALLER F= rejected RCPT : Sender verify failed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> rejected RCPT : relay not permitted 1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/runtest b/test/runtest index 9fef60820..6fa17f9dc 100755 --- a/test/runtest +++ b/test/runtest @@ -1096,12 +1096,12 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^Reset TZ to/; # port numbers - s/(?:\[[^\]]*\]:|port )\K$parm_port_d/PORT_D/; - s/(?:\[[^\]]*\]:|port )\K$parm_port_d2/PORT_D2/; - s/(?:\[[^\]]*\]:|port )\K$parm_port_d3/PORT_D3/; - s/(?:\[[^\]]*\]:|port )\K$parm_port_d4/PORT_D4/; - s/(?:\[[^\]]*\]:|port )\K$parm_port_s/PORT_S/; - s/(?:\[[^\]]*\]:|port )\K$parm_port_n/PORT_N/; + s/(?:\[[^\]]*\]:|V4NET\.0\.0\.0:|localhost::?|127\.0\.0\.1[.:]:?|port[= ])\K$parm_port_d/PORT_D/; + s/(?:\[[^\]]*\]:|V4NET\.0\.0\.0:|localhost::?|127\.0\.0\.1[.:]:?|port[= ])\K$parm_port_d2/PORT_D2/; + s/(?:\[[^\]]*\]:|V4NET\.0\.0\.0:|localhost::?|127\.0\.0\.1[.:]:?|port[= ])\K$parm_port_d3/PORT_D3/; + s/(?:\[[^\]]*\]:|V4NET\.0\.0\.0:|localhost::?|127\.0\.0\.1[.:]:?|port[= ])\K$parm_port_d4/PORT_D4/; + s/(?:\[[^\]]*\]:|V4NET\.0\.0\.0:|localhost::?|127\.0\.0\.1[.:]:?|port[= ])\K$parm_port_s/PORT_S/; + s/(?:\[[^\]]*\]:|V4NET\.0\.0\.0:|localhost::?|127\.0\.0\.1[.:]:?|port[= ])\K$parm_port_n/PORT_N/; # ========= Exim lookups ================== # Lookups have a char which depends on the number of lookup types compiled in, diff --git a/test/stderr/0143 b/test/stderr/0143 index e9abae9c2..395e32f9d 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -20,7 +20,7 @@ hostlist: checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com) -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes diff --git a/test/stderr/0217 b/test/stderr/0217 index 3885a352c..1aac31e4c 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -1,7 +1,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmbL-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -834,7 +834,7 @@ LOG: MAIN LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmbP-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK diff --git a/test/stderr/0218 b/test/stderr/0218 index 216734dd2..abba84e9f 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -20,7 +20,7 @@ looking in TESTSUITE/spool//input delivering 10HmaX-0005vi-00 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -93,7 +93,7 @@ looking in TESTSUITE/spool//input delivering 10HmaZ-0005vi-00 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -124,7 +124,7 @@ LOG: MAIN delivering 10HmbA-0005vi-00 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN @@ -159,7 +159,7 @@ T: send_to_server (ACL) delivering 10HmbA-0005vi-00 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK diff --git a/test/stderr/0227 b/test/stderr/0227 index 8d766d61d..827d68e47 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -1,6 +1,6 @@ LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -20,7 +20,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -40,7 +40,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -60,7 +60,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -78,7 +78,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -97,7 +97,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -115,7 +115,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -133,7 +133,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -152,7 +152,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -170,15 +170,15 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F= temporarily rejected RCPT : Could not complete recipient verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -196,7 +196,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -214,7 +214,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -239,7 +239,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -266,7 +266,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher sverifier @@ -284,7 +284,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher rverifier @@ -304,7 +304,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher rverifier @@ -324,7 +324,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher rverifier @@ -350,7 +350,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> LHLO myhost.test.ex SMTP<< 250 OK @@ -368,7 +368,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(closed)<< SMTP(close)>> cmdlog: '(unset)' @@ -380,7 +380,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root sender verify defer for : Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused LOG: MAIN REJECT diff --git a/test/stderr/0276 b/test/stderr/0276 index eb289faae..2b7158465 100644 --- a/test/stderr/0276 +++ b/test/stderr/0276 @@ -1,7 +1,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmaX-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-server id @@ -23,7 +23,7 @@ LOG: MAIN LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss delivering 10HmaY-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN @@ -39,7 +39,7 @@ LOG: MAIN LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-server id @@ -60,7 +60,7 @@ LOG: MAIN LOG: MAIN <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss delivering 10HmbA-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN diff --git a/test/stderr/0376 b/test/stderr/0376 index bdcbfddbe..995eafc77 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -11,8 +11,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: no domain record found for localhost callout cache: no address record found for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -60,8 +60,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root sender verify defer for : Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused created log directory TESTSUITE/spool/log @@ -83,8 +83,8 @@ Considering bad@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: no address record found for bad@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -140,8 +140,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -193,8 +193,8 @@ Considering ok@otherhost Attempting full verification using callout callout cache: no domain record found for otherhost callout cache: no address record found for ok@otherhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -256,8 +256,8 @@ Considering ok@otherhost2 Attempting full verification using callout callout cache: no domain record found for otherhost2 callout cache: no address record found for ok@otherhost2 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -313,8 +313,8 @@ Considering ok@otherhost3 Attempting full verification using callout callout cache: no domain record found for otherhost3 callout cache: no address record found for ok@otherhost3 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -364,8 +364,8 @@ Considering ok@otherhost4 Attempting full verification using callout callout cache: no domain record found for otherhost4 callout cache: no address record found for ok@otherhost4 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -415,8 +415,8 @@ Considering ok@otherhost41 Attempting full verification using callout callout cache: no domain record found for otherhost41 callout cache: no address record found for ok@otherhost41 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -479,8 +479,8 @@ Considering ok@otherhost21 Attempting full verification using callout callout cache: no domain record found for otherhost21 callout cache: no address record found for ok@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -519,8 +519,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost21 callout cache: domain accepts RCPT TO: callout cache: no address record found for ok2@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -551,8 +551,8 @@ Considering ok@otherhost31 Attempting full verification using callout callout cache: no domain record found for otherhost31 callout cache: no address record found for ok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -590,8 +590,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost31 callout cache: domain rejects random addresses callout cache: no address record found for okok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -622,8 +622,8 @@ Considering okokok@otherhost31 Attempting full verification using callout callout cache: domain record expired for otherhost31 callout cache: no address record found for okokok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -660,8 +660,8 @@ Considering okok@otherhost51 Attempting full verification using callout callout cache: no domain record found for otherhost51 callout cache: no address record found for okok@otherhost51 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -694,8 +694,8 @@ Considering okokok@otherhost52 Attempting full verification using callout callout cache: no domain record found for otherhost52 callout cache: no address record found for okokok@otherhost52 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -734,8 +734,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: no domain record found for x.y.z callout cache: no address record found for abcd@x.y.z/ -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -769,8 +769,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: found domain record for x.y.z callout cache: no address record found for abcd@x.y.z -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -801,8 +801,8 @@ Considering ok@otherhost9 Attempting full verification using callout callout cache: no domain record found for otherhost9 callout cache: no address record found for ok@otherhost9 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -842,8 +842,8 @@ Considering z@test.ex Attempting full verification using callout callout cache: no domain record found for test.ex callout cache: no address record found for z@test.ex/ -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK diff --git a/test/stderr/0388 b/test/stderr/0388 index afa54d2b4..49b407430 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -81,7 +81,7 @@ checking status of 127.0.0.1 no retry data available 127.0.0.1 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex @@ -116,15 +116,15 @@ checking status of V4NET.0.0.0 no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER -added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2 set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called -reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess +reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S from subprocess added retry item reading retry information for R:x@y from subprocess added retry item @@ -157,14 +157,14 @@ Writing retry data for R:x@y address match test: subject=*@V4NET.0.0.0 pattern=* V4NET.0.0.0 in "*"? yes (matched "*") *@V4NET.0.0.0 in "*"? yes (matched "*") -retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 - dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 +retry for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S (y) = * 0 0 + dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S failing_interval=ttt message_age=ttt on queue longer than maximum retry -Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224 +Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S first failed=dddd last try=dddd next try=+0 expired=0 errno=dd more_errno=dd,A Network Error - dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 + dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded diff --git a/test/stderr/0398 b/test/stderr/0398 index d3ce2928f..6ca63ed96 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -129,8 +129,8 @@ Attempting full verification using callout callout cache: no address record found for qq@remote EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO mail.test.ex diff --git a/test/stderr/0432 b/test/stderr/0432 index dbbe00b2c..b29e326c6 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -96,8 +96,8 @@ Attempting full verification using callout callout cache: no address record found for x@y EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex @@ -275,8 +275,8 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: no domain record found for b >>> callout cache: no address record found for a@b ->>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +>>> interface=NULL port=PORT_S +>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -323,8 +323,8 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: no domain record found for q >>> callout cache: no address record found for p1@q ->>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +>>> interface=NULL port=PORT_S +>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/0433 b/test/stderr/0433 index 826791208..da7d5933d 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -19,7 +19,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1240 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1240 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -42,7 +42,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1241 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1241 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -66,7 +66,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -90,7 +90,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.PORT_D4 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -115,7 +115,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... diff --git a/test/stderr/0450 b/test/stderr/0450 index 07fad27e8..e502012d8 100644 --- a/test/stderr/0450 +++ b/test/stderr/0450 @@ -21,7 +21,7 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database added 10HmaX-0005vi-00 to queue for 127.0.0.1 @@ -50,7 +50,7 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D2: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database already listed for 127.0.0.1 diff --git a/test/stderr/0462 b/test/stderr/0462 index d10624cf5..446305178 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -11,8 +11,8 @@ Considering Ok@localhost Attempting full verification using callout callout cache: no domain record found for localhost callout cache: no address record found for Ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -63,8 +63,8 @@ Considering NOTok@elsewhere Attempting full verification using callout callout cache: no domain record found for elsewhere callout cache: no address record found for NOTok@elsewhere -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -99,8 +99,8 @@ Considering NOTok2@elsewhere Attempting full verification using callout callout cache: found domain record for elsewhere callout cache: no address record found for NOTok2@elsewhere -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK diff --git a/test/stderr/0467 b/test/stderr/0467 index 463e4a70e..b2aa2ef56 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -15,8 +15,8 @@ LOG: MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 -Transport port=25 replaced by host-specific port=1224 -Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected +Transport port=25 replaced by host-specific port=PORT_S +Connecting to localhost.test.ex [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-server id @@ -36,6 +36,6 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' LOG: MAIN - => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK" + => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:PORT_S C="250 OK" LOG: MAIN Completed diff --git a/test/stderr/0473 b/test/stderr/0473 index b0d536923..21de8a28f 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -11,8 +11,8 @@ Considering r11@two.test.ex Attempting full verification using callout callout cache: found domain record for two.test.ex callout cache: no address record found for r11@two.test.ex -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name SMTP<< 250 OK @@ -43,8 +43,8 @@ Considering r11@two.test.ex Attempting full verification using callout callout cache: found domain record for two.test.ex callout cache: no address record found for r11@two.test.ex -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(Connection timed out)<< SMTP(close)>> cmdlog: '(unset)' diff --git a/test/stderr/0476 b/test/stderr/0476 index a51e2ce21..ce5143458 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -18,7 +18,7 @@ checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name cmd buf flush ddd bytes @@ -85,11 +85,11 @@ checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name) set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database added 10HmaZ-0005vi-00 to queue for 127.0.0.1 diff --git a/test/stderr/0512 b/test/stderr/0512 index 3765a681f..e54ebb17e 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -15,10 +15,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -26,10 +26,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -37,10 +37,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -48,10 +48,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 reached transport hosts_max_try limit 1 all IP addresses skipped or deferred at least one address updating wait-t1 database @@ -103,10 +103,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -114,10 +114,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) reached transport hosts_max_try_hardlimit limit 2 all IP addresses skipped or deferred at least one address diff --git a/test/stderr/0525 b/test/stderr/0525 index 8ed331d62..efa09eb19 100644 --- a/test/stderr/0525 +++ b/test/stderr/0525 @@ -3,7 +3,7 @@ LOG: smtp_connection MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss delivering 10HmaX-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Welcome SMTP>> EHLO myhost.test.ex SMTP<< 250 Hi diff --git a/test/stderr/0578 b/test/stderr/0578 index 1f589288c..51166675c 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -11,8 +11,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: no domain record found for localhost callout cache: no address record found for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -62,8 +62,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root sender verify defer for : Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused created log directory TESTSUITE/spool/log @@ -85,8 +85,8 @@ Considering bad@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: no address record found for bad@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -144,8 +144,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -201,8 +201,8 @@ Considering ok@otherhost Attempting full verification using callout callout cache: no domain record found for otherhost callout cache: no address record found for ok@otherhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -266,8 +266,8 @@ Considering ok@otherhost2 Attempting full verification using callout callout cache: no domain record found for otherhost2 callout cache: no address record found for ok@otherhost2 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -325,8 +325,8 @@ Considering ok@otherhost3 Attempting full verification using callout callout cache: no domain record found for otherhost3 callout cache: no address record found for ok@otherhost3 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -378,8 +378,8 @@ Considering ok@otherhost4 Attempting full verification using callout callout cache: no domain record found for otherhost4 callout cache: no address record found for ok@otherhost4 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -431,8 +431,8 @@ Considering ok@otherhost41 Attempting full verification using callout callout cache: no domain record found for otherhost41 callout cache: no address record found for ok@otherhost41 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -497,8 +497,8 @@ Considering ok@otherhost21 Attempting full verification using callout callout cache: no domain record found for otherhost21 callout cache: no address record found for ok@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -539,8 +539,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost21 callout cache: domain accepts RCPT TO: callout cache: no address record found for ok2@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -573,8 +573,8 @@ Considering ok@otherhost31 Attempting full verification using callout callout cache: no domain record found for otherhost31 callout cache: no address record found for ok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -614,8 +614,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost31 callout cache: domain rejects random addresses callout cache: no address record found for okok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -648,8 +648,8 @@ Considering okokok@otherhost31 Attempting full verification using callout callout cache: domain record expired for otherhost31 callout cache: no address record found for okokok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -688,8 +688,8 @@ Considering okok@otherhost51 Attempting full verification using callout callout cache: no domain record found for otherhost51 callout cache: no address record found for okok@otherhost51 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -724,8 +724,8 @@ Considering okokok@otherhost52 Attempting full verification using callout callout cache: no domain record found for otherhost52 callout cache: no address record found for okokok@otherhost52 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -766,8 +766,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: no domain record found for x.y.z callout cache: no address record found for abcd@x.y.z/ -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -803,8 +803,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: found domain record for x.y.z callout cache: no address record found for abcd@x.y.z -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -837,8 +837,8 @@ Considering ok@otherhost9 Attempting full verification using callout callout cache: no domain record found for otherhost9 callout cache: no address record found for ok@otherhost9 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -880,8 +880,8 @@ Considering z@test.ex Attempting full verification using callout callout cache: no domain record found for test.ex callout cache: no address record found for z@test.ex/ -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate diff --git a/test/stderr/0623 b/test/stderr/0623 index 45780b023..9c76ebb6e 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -55,7 +55,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:451:221' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN @@ -187,7 +187,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN diff --git a/test/stderr/0911 b/test/stderr/0911 index 65236b1a5..5bd87540c 100644 --- a/test/stderr/0911 +++ b/test/stderr/0911 @@ -189,7 +189,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:451:221' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN @@ -329,7 +329,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN diff --git a/test/stderr/1007 b/test/stderr/1007 index 67fd926d2..ceb19161b 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -20,7 +20,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -45,7 +45,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -71,7 +71,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -97,7 +97,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1245 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1245 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.PORT_D4 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -120,7 +120,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:i daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1246 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1246 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -146,7 +146,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port P daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1247 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1247 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1239 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -173,7 +173,7 @@ set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -p1248 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1248 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=PORT_D:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... diff --git a/test/stderr/2610 b/test/stderr/2610 index b1374232a..5306d8582 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -13,7 +13,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select name from them where id='ph10';" opts=NULL database lookup required for select name from them where id='ph10'; MySQL query: "select name from them where id='ph10';" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" @@ -34,7 +34,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select name from them where id='xxxx';" opts=NULL database lookup required for select name from them where id='xxxx'; MySQL query: "select name from them where id='xxxx';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -47,7 +47,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select name from them where id='nothing';" opts=NULL database lookup required for select name from them where id='nothing'; MySQL query: "select name from them where id='nothing';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: search_open: mysql "NULL" @@ -59,7 +59,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select id,name from them where id='nothing';" opts=NULL database lookup required for select id,name from them where id='nothing'; MySQL query: "select id,name from them where id='nothing';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: id=nothing name="" search_open: mysql "NULL" @@ -71,7 +71,7 @@ dropping to exim gid; retaining priv uid type=mysql key="delete from them where id='nonexist';" opts=NULL database lookup required for delete from them where id='nonexist'; MySQL query: "delete from them where id='nonexist';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: query was not one that returns data lookup forced cache cleanup lookup yielded: 0 @@ -84,7 +84,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='quote';" opts=NULL database lookup required for select * from them where id='quote'; MySQL query: "select * from them where id='quote';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -97,7 +97,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='filter';" opts=NULL database lookup required for select * from them where id='filter'; MySQL query: "select * from them where id='filter';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -110,7 +110,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='quote2';" opts=NULL database lookup required for select * from them where id='quote2'; MySQL query: "select * from them where id='quote2';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: name="\"stquot" id=quote2 search_open: mysql "NULL" @@ -122,54 +122,54 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='nlonly';" opts=NULL database lookup required for select * from them where id='nlonly'; MySQL query: "select * from them where id='nlonly';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" opts=NULL - database lookup required for servers=x:127.0.0.1::1223; select name from them where id='ph10'; - MySQL query: "servers=x:127.0.0.1::1223; select name from them where id='ph10';" opts 'NULL' + type=mysql key="servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" opts=NULL + database lookup required for servers=x:127.0.0.1::PORT_N; select name from them where id='ph10'; + MySQL query: "servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" opts 'NULL' lookup deferred: MySQL server "x" not found in mysql_servers search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=127.0.0.1::1223:x; select name from them where id='ph10'; - MySQL query: "servers=127.0.0.1::1223:x; select name from them where id='ph10';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + type=mysql key="servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N:x; select name from them where id='ph10'; + MySQL query: "servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" opts 'NULL' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10'; - MySQL query: "servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + type=mysql key="servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10'; + MySQL query: "servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" opts 'NULL' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" opts=NULL - database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10'; - MySQL query: "servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" opts 'NULL' - MYSQL new connection: host=ip4.ip4.ip4.ip4 port=1223 socket=NULL database=test user=root + type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" opts=NULL + database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10'; + MySQL query: "servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" opts 'NULL' + MYSQL new connection: host=ip4.ip4.ip4.ip4 port=PORT_N socket=NULL database=test user=root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" @@ -193,7 +193,7 @@ dropping to exim gid; retaining priv uid type=mysql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa'); MySQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel Aristotle @@ -206,7 +206,7 @@ dropping to exim gid; retaining priv uid type=mysql key="SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT * FROM them WHERE id IN ('ph10', 'aaaa'); MySQL query: "SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: name="Philip Hazel" id=ph10 name=Aristotle id=aaaa @@ -219,14 +219,14 @@ dropping to exim gid; retaining priv uid type=mysql key="delete from them where id='aaaa'" opts=NULL database lookup required for delete from them where id='aaaa' MySQL query: "delete from them where id='aaaa'" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: query was not one that returns data lookup forced cache cleanup lookup yielded: 1 search_tidyup called close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root -close MYSQL connection: 127.0.0.1:1223/test/root +close MYSQL connection: 127.0.0.1:PORT_N/test/root >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective @@ -276,7 +276,7 @@ processing "warn" (TESTSUITE/test-config 26) database lookup required for select name from them where id = 'c' (tainted, quoted:mysql) MySQL query: "select name from them where id = 'c'" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root MYSQL: no data found creating new cache entry lookup failed @@ -295,7 +295,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 26): select name from them where id = 'c' search_type NN (mysql) quoting -1 (none) MySQL query: "select name from them where id = 'c'" opts 'no_rd' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found replacing old cache entry lookup failed @@ -306,49 +306,49 @@ processing "warn" (TESTSUITE/test-config 31) search_open: mysql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223/test/root/pass" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N/test/root/pass" LRU list: internal_search_find: file="NULL" - type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223/test/root/pass" + type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::PORT_N/test/root/pass" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:mysql) - MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223/test/root/pass' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223/test/root/pass {select name from them where id = '${quote_mysql:$local_part}'}} +check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::PORT_N/test/root/pass {select name from them where id = '${quote_mysql:$local_part}'}} = ok: search_open: mysql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N" LRU list: internal_search_find: file="NULL" - type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223" + type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::PORT_N" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:mysql) - MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::PORT_N' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223 {select name from them where id = '${quote_mysql:$local_part}'}} +check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::PORT_N {select name from them where id = '${quote_mysql:$local_part}'}} = ok: search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c'" opts=NULL - database lookup required for servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c' + type=mysql key="servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c' (tainted, quoted:mysql) - MySQL query: "servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c'" opts 'NULL' - lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" opts 'NULL' + lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "warn" (TESTSUITE/test-config 40) check set acl_m0 = ok: hostlist check hosts = net-mysql;select * from them where id='${quote_mysql:$local_part}' @@ -362,7 +362,7 @@ internal_search_find: file="NULL" database lookup required for select * from them where id='c' (tainted, quoted:mysql) MySQL query: "select * from them where id='c'" opts 'NULL' -MYSQL using cached connection for 127.0.0.1:1223/test/root +MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -370,40 +370,40 @@ host in "net-mysql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 43) check set acl_m0 = FAIL: hostlist -check hosts = <& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='${quote_mysql:$local_part}' +check hosts = <& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'" opts=NULL -database lookup required for servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' + type=mysql key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts=NULL +database lookup required for servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c' (tainted, quoted:mysql) -MySQL query: "servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'" opts 'NULL' -lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted -host in "<& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' +MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts 'NULL' +lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted +host in "<& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "warn" (TESTSUITE/test-config 48) check set acl_m0 = FAIL: hostlist -check hosts = <& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='${quote_mysql:$local_part}' +check hosts = <& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' search_open: mysql "NULL" cached open search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223/test/root/pass" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N/test/root/pass" LRU list: internal_search_find: file="NULL" - type=mysql key=" select * from them where id='c'" opts="servers=127.0.0.1::1223/test/root/pass" + type=mysql key=" select * from them where id='c'" opts="servers=127.0.0.1::PORT_N/test/root/pass" database lookup required for select * from them where id='c' (tainted, quoted:mysql) -MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::1223/test/root/pass' -lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted -host in "<& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' +MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' +lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted +host in "<& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "accept" (TESTSUITE/test-config 51) check domains = +local_domains d in "@"? no (end of list) @@ -420,7 +420,7 @@ internal_search_find: file="NULL" type=mysql key="select * from them where id='10.0.0.0'" opts=NULL database lookup required for select * from them where id='10.0.0.0' MySQL query: "select * from them where id='10.0.0.0'" opts 'NULL' -MYSQL using cached connection for 127.0.0.1:1223/test/root +MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -439,7 +439,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called -close MYSQL connection: 127.0.0.1:1223/test/root +close MYSQL connection: 127.0.0.1:PORT_N/test/root >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective @@ -544,7 +544,7 @@ local_part=ph10 domain=myhost.test.ex database lookup required for select name from them where id='ph10@myhost.test.ex' (tainted, quoted:mysql) MySQL query: "select name from them where id='ph10@myhost.test.ex'" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root MYSQL: no data found creating new cache entry lookup failed @@ -563,7 +563,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (router r1, TESTSUITE/test-config 66): select name from them where id='ph10' search_type NN (mysql) quoting -1 (none) MySQL query: "select name from them where id='ph10'" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel calling r1 router @@ -585,7 +585,7 @@ After routing: Failed addresses: Deferred addresses: search_tidyup called -close MYSQL connection: 127.0.0.1:1223/test/root +close MYSQL connection: 127.0.0.1:PORT_N/test/root >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> ph10@myhost.test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile @@ -612,7 +612,7 @@ LOG: MAIN tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 79): select id from them where id='ph10' search_type NN (mysql) quoting -1 (none) MySQL query: "select id from them where id='ph10'" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root creating new cache entry lookup yielded: ph10 appendfile: mode=600 notify_comsat=0 quota=0 warning=0 @@ -632,7 +632,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -close MYSQL connection: 127.0.0.1:1223/test/root +close MYSQL connection: 127.0.0.1:PORT_N/test/root journalling ph10@myhost.test.ex t1 transport returned OK for ph10@myhost.test.ex post-process ph10@myhost.test.ex (0) diff --git a/test/stderr/2620 b/test/stderr/2620 index ba77eee38..24c8f77a0 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -14,7 +14,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select name from them where id='ph10';" opts=NULL database lookup required for select name from them where id='ph10'; PostgreSQL query: "select name from them where id='ph10';" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry lookup yielded: Philip Hazel search_open: pgsql "NULL" @@ -35,7 +35,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select name from them where id='xxxx';" opts=NULL database lookup required for select name from them where id='xxxx'; PostgreSQL query: "select name from them where id='xxxx';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found creating new cache entry lookup failed @@ -48,7 +48,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select name from them where id='nothing';" opts=NULL database lookup required for select name from them where id='nothing'; PostgreSQL query: "select name from them where id='nothing';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: search_open: pgsql "NULL" @@ -60,7 +60,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select id,name from them where id='nothing';" opts=NULL database lookup required for select id,name from them where id='nothing'; PostgreSQL query: "select id,name from them where id='nothing';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: id=nothing name="" search_open: pgsql "NULL" @@ -72,7 +72,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="delete from them where id='nonexist';" opts=NULL database lookup required for delete from them where id='nonexist'; PostgreSQL query: "delete from them where id='nonexist';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: command does not return any data but was successful. Rows affected: 0 lookup forced cache cleanup lookup yielded: 0 @@ -85,7 +85,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where id='quote2';" opts=NULL database lookup required for select * from them where id='quote2'; PostgreSQL query: "select * from them where id='quote2';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="\"stquot" id=quote2 search_open: pgsql "NULL" @@ -97,7 +97,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where id='newline';" opts=NULL database lookup required for select * from them where id='newline'; PostgreSQL query: "select * from them where id='newline';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="before after" id=newline @@ -110,7 +110,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where id='tab';" opts=NULL database lookup required for select * from them where id='tab'; PostgreSQL query: "select * from them where id='tab';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="x x" id=tab search_open: pgsql "NULL" @@ -122,7 +122,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where name='''stquot';" opts=NULL database lookup required for select * from them where name='''stquot'; PostgreSQL query: "select * from them where name='''stquot';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name='stquot id=quote1 search_open: pgsql "NULL" @@ -138,25 +138,25 @@ dropping to exim gid; retaining priv uid search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=localhost::1223:x; select name from them where id='ph10'; - PostgreSQL query: "servers=localhost::1223:x; select name from them where id='ph10';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + type=pgsql key="servers=localhost::PORT_N:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=localhost::PORT_N:x; select name from them where id='ph10'; + PostgreSQL query: "servers=localhost::PORT_N:x; select name from them where id='ph10';" opts 'NULL' + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: Philip Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10'; - PostgreSQL query: "servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + type=pgsql key="servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10'; + PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL' + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: Philip Hazel search_open: pgsql "NULL" @@ -180,7 +180,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa'); PostgreSQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: Philip Hazel Aristotle @@ -193,7 +193,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT * FROM them WHERE id IN ('ph10', 'aaaa'); PostgreSQL query: "SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="Philip Hazel" id=ph10 name=Aristotle id=aaaa @@ -206,13 +206,13 @@ dropping to exim gid; retaining priv uid type=pgsql key="delete from them where id='aaaa'" opts=NULL database lookup required for delete from them where id='aaaa' PostgreSQL query: "delete from them where id='aaaa'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: command does not return any data but was successful. Rows affected: 1 lookup forced cache cleanup lookup yielded: 1 search_tidyup called close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER -close PGSQL connection: localhost:1223/test/CALLER +close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective @@ -262,7 +262,7 @@ processing "warn" (TESTSUITE/test-config 27) database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER PGSQL: no data found creating new cache entry lookup failed @@ -281,7 +281,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c' search_type NN (pgsql) quoting -1 (none) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed @@ -292,49 +292,49 @@ processing "warn" (TESTSUITE/test-config 32) search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N/test/CALLER/" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223/test/CALLER/' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N/test/CALLER/' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223 {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts=NULL - database lookup required for servers=localhost::1223/test/CALLER/; select name from them where id = 'c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts=NULL + database lookup required for servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts 'NULL' - lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts 'NULL' + lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 41) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='${quote_pgsql:$local_part}' @@ -348,7 +348,7 @@ internal_search_find: file="NULL" database lookup required for select * from them where id='c' (tainted, quoted:pgsql) PostgreSQL query: "select * from them where id='c'" opts 'NULL' -PGSQL using cached connection for localhost:1223/test/CALLER +PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found creating new cache entry lookup failed @@ -356,40 +356,40 @@ host in "net-pgsql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts=NULL -database lookup required for servers=localhost::1223/test/CALLER/; select * from them where id='c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts=NULL +database lookup required for servers=localhost::PORT_N/test/CALLER/; select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: "servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts 'NULL' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts 'NULL' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 49) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key=" select * from them where id='c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key=" select * from them where id='c'" opts="servers=localhost::PORT_N/test/CALLER/" database lookup required for select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::1223/test/CALLER/' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::PORT_N/test/CALLER/' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "accept" (TESTSUITE/test-config 52) check domains = +local_domains d in "@"? no (end of list) @@ -406,7 +406,7 @@ internal_search_find: file="NULL" type=pgsql key="select * from them where id='10.0.0.0'" opts=NULL database lookup required for select * from them where id='10.0.0.0' PostgreSQL query: "select * from them where id='10.0.0.0'" opts 'NULL' -PGSQL using cached connection for localhost:1223/test/CALLER +PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found creating new cache entry lookup failed @@ -433,7 +433,7 @@ processing "warn" (TESTSUITE/test-config 27) cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed @@ -452,7 +452,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c' search_type NN (pgsql) quoting -1 (none) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed @@ -463,49 +463,49 @@ processing "warn" (TESTSUITE/test-config 32) search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N/test/CALLER/" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223/test/CALLER/' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N/test/CALLER/' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223 {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts=NULL - database lookup required for servers=localhost::1223/test/CALLER/; select name from them where id = 'c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts=NULL + database lookup required for servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts 'NULL' - lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts 'NULL' + lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 41) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='${quote_pgsql:$local_part}' @@ -522,40 +522,40 @@ host in "net-pgsql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts=NULL -database lookup required for servers=localhost::1223/test/CALLER/; select * from them where id='c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts=NULL +database lookup required for servers=localhost::PORT_N/test/CALLER/; select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: "servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts 'NULL' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts 'NULL' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 49) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key=" select * from them where id='c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key=" select * from them where id='c'" opts="servers=localhost::PORT_N/test/CALLER/" database lookup required for select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::1223/test/CALLER/' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::PORT_N/test/CALLER/' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "accept" (TESTSUITE/test-config 52) check domains = +local_domains d in "@"? no (end of list) @@ -587,7 +587,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called -close PGSQL connection: localhost:1223/test/CALLER +close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective @@ -686,7 +686,7 @@ processing address_data type=pgsql key="select name from them where id='ph10'" opts=NULL database lookup required for select name from them where id='ph10' PostgreSQL query: "select name from them where id='ph10'" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry lookup yielded: Philip Hazel calling r1 router @@ -708,7 +708,7 @@ After routing: Failed addresses: Deferred addresses: search_tidyup called -close PGSQL connection: localhost:1223/test/CALLER +close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> CALLER@myhost.test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile @@ -731,7 +731,7 @@ appendfile transport entered type=pgsql key="select id from them where id='ph10'" opts=NULL database lookup required for select id from them where id='ph10' PostgreSQL query: "select id from them where id='ph10'" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry lookup yielded: ph10 appendfile: mode=600 notify_comsat=0 quota=0 warning=0 @@ -751,7 +751,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -close PGSQL connection: localhost:1223/test/CALLER +close PGSQL connection: localhost:PORT_N/test/CALLER journalling CALLER@myhost.test.ex t1 transport returned OK for CALLER@myhost.test.ex post-process CALLER@myhost.test.ex (0) diff --git a/test/stderr/3404 b/test/stderr/3404 index ceb395949..1ba6a2540 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -1,7 +1,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaX-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -30,7 +30,7 @@ LOG: MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaY-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -59,7 +59,7 @@ LOG: MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250-OK diff --git a/test/stderr/4052 b/test/stderr/4052 index 2e4a90bdd..c8a0c69be 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -19,7 +19,7 @@ no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex) -Transport port=25 replaced by host-specific port=1225 +Transport port=25 replaced by host-specific port=PORT_D EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000 Using cached cleartext PIPECONNECT SMTP|> EHLO the.local.host.name diff --git a/test/stderr/5403 b/test/stderr/5403 index 17296572a..ca16db4fd 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -68,8 +68,8 @@ MUNGED: ::1 will be omitted in what follows >>> routed by all router >>> Attempting full verification using callout >>> callout cache: disabled by no_cache ->>> interface=ip4.ip4.ip4.ip4 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +>>> interface=ip4.ip4.ip4.ip4 port=PORT_S +>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5820 b/test/stderr/5820 index 17dcf1c34..053929525 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -22,7 +22,7 @@ >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4") ->>> interface=NULL port=1225 +>>> interface=NULL port=PORT_D >>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) diff --git a/test/stderr/5840 b/test/stderr/5840 index efbac4958..6cae7d46e 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -22,7 +22,7 @@ >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4") ->>> interface=NULL port=1225 +>>> interface=NULL port=PORT_D >>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)