Gitweb:
https://git.exim.org/exim.git/commitdiff/b48cf0793366791f5bdef8526a4956d4523c6778
Commit: b48cf0793366791f5bdef8526a4956d4523c6778
Parent: 3b44d6d3fb4ef9b53bfa9494bf444c11aba030cb
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Jul 22 10:13:42 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jul 22 11:12:49 2019 +0100
Testsuite: Debug: indent lowlevel connect result
---
test/runtest | 8 ++++----
test/stderr/0143 | 2 +-
test/stderr/0217 | 4 ++--
test/stderr/0218 | 8 ++++----
test/stderr/0227 | 40 ++++++++++++++++++++--------------------
test/stderr/0276 | 8 ++++----
test/stderr/0376 | 40 ++++++++++++++++++++--------------------
test/stderr/0388 | 2 +-
test/stderr/0398 | 2 +-
test/stderr/0432 | 2 +-
test/stderr/0450 | 4 ++--
test/stderr/0462 | 6 +++---
test/stderr/0467 | 2 +-
test/stderr/0473 | 4 ++--
test/stderr/0476 | 4 ++--
test/stderr/0512 | 12 ++++++------
test/stderr/0525 | 2 +-
test/stderr/0578 | 40 ++++++++++++++++++++--------------------
test/stderr/2008 | 6 +++---
test/stderr/2035 | 2 +-
test/stderr/2108 | 6 +++---
test/stderr/2135 | 2 +-
test/stderr/3404 | 6 +++---
test/stderr/5410 | 6 +++---
test/stderr/5420 | 6 +++---
25 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/test/runtest b/test/runtest
index 8515e2f..fe1f4ef 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1230,17 +1230,17 @@ RESET_AFTER_EXTRA_LINE_READ:
$/x)
{
$_ = $1 . " ... " . <IN>;
- s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;
+ s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;
- if (/^Connecting to .* \.\.\. connected$/)
+ if (/^Connecting to .* \.\.\. connected$/)
{
$_ .= <IN>;
- if (/^(Connecting to .* \.\.\. )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
+ if (/^(Connecting to .* \.\.\. )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
{
$_ = $1 . "failed: Connection refused\n" . <IN>;
s/^(Connecting .*)\n\s+SMTP\(close\)>>$/$1/;
}
- elsif (/^(Connecting to .* \.\.\. connected\n)read response data: size=/)
+ elsif (/^(Connecting to .* \.\.\. connected\n)read response data: size=/)
{ $_ = $1; }
# Date/time in SMTP banner
diff --git a/test/stderr/0143 b/test/stderr/0143
index 68180bd..4832486 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@???)
-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]:1224 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 16eaa05..c65c953 100644
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -1,7 +1,7 @@
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -830,7 +830,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
diff --git a/test/stderr/0218 b/test/stderr/0218
index 5bc1654..5f64add 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -18,7 +18,7 @@ looking in TESTSUITE/spool//input
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -82,7 +82,7 @@ looking in TESTSUITE/spool//input
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -109,7 +109,7 @@ LOG: MAIN
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
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]:1224 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
@@ -140,7 +140,7 @@ T: send_to_server (ACL)
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
diff --git a/test/stderr/0227 b/test/stderr/0227
index 4fd9d54..768c810 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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -19,7 +19,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -38,7 +38,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -57,7 +57,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -74,7 +74,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -92,7 +92,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -109,7 +109,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -127,15 +127,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]:1224 ... failed: Connection refused
+Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ... failed: Connection refused
LOG: MAIN REJECT
H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: 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]:1224 ... 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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -169,7 +169,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -193,7 +193,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -219,7 +219,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250- wotcher sverifier
@@ -236,7 +236,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250- wotcher rverifier
@@ -255,7 +255,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250- wotcher rverifier
@@ -274,7 +274,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250- wotcher rverifier
@@ -299,7 +299,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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> LHLO myhost.test.ex
SMTP<< 250 OK
@@ -316,7 +316,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]:1224 ... connected
SMTP(closed)<<
SMTP(close)>>
LOG: MAIN REJECT
@@ -327,7 +327,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]:1224 ... failed: Connection refused
LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: 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 4f4270e..992e67b 100644
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -1,7 +1,7 @@
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
@@ -20,7 +20,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]:1224 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
@@ -36,7 +36,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
@@ -54,7 +54,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]:1224 ... 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 334af5a..9e1ec6c 100644
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -12,7 +12,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -60,7 +60,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
created log directory TESTSUITE/spool/log
@@ -83,7 +83,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -139,7 +139,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -191,7 +191,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -253,7 +253,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -309,7 +309,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -359,7 +359,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -409,7 +409,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -472,7 +472,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -511,7 +511,7 @@ callout cache: found domain record for otherhost21
callout cache: domain accepts RCPT TO:<postmaster@domain>
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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -542,7 +542,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -580,7 +580,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -611,7 +611,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -648,7 +648,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -681,7 +681,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -720,7 +720,7 @@ Attempting full verification using callout
callout cache: no domain record found for x.y.z
callout cache: no address record found for abcd@???/<somesender@???>
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -754,7 +754,7 @@ Attempting full verification using callout
callout cache: found domain record for x.y.z
callout cache: no address record found for abcd@???
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -785,7 +785,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -825,7 +825,7 @@ Attempting full verification using callout
callout cache: no domain record found for test.ex
callout cache: no address record found for z@???/<postmaster@???>
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
diff --git a/test/stderr/0388 b/test/stderr/0388
index 9e9822f..a9be60f 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -82,7 +82,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]:1224 ... 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/0398 b/test/stderr/0398
index 0f09df9..82e188f 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -128,7 +128,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 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 3e5a3e5..fc54dfb 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -90,7 +90,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 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/0450 b/test/stderr/0450
index b88283b..7edba53 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -18,7 +18,7 @@ getting address for 127.0.0.1
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@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... 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
@@ -47,7 +47,7 @@ no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1112 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1226 ... 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
diff --git a/test/stderr/0462 b/test/stderr/0462
index 9d2778d..9b821df 100644
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -12,7 +12,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -63,7 +63,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -98,7 +98,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
diff --git a/test/stderr/0467 b/test/stderr/0467
index 8d2018e..fdf48df 100644
--- a/test/stderr/0467
+++ b/test/stderr/0467
@@ -16,7 +16,7 @@ LOG: MAIN
<= CALLER@??? 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
+Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-server id
diff --git a/test/stderr/0473 b/test/stderr/0473
index 2ab1628..2714530 100644
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -12,7 +12,7 @@ Attempting full verification using callout
callout cache: found domain record for two.test.ex
callout cache: no address record found for r11@???
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO the.local.host.name
SMTP<< 250 OK
@@ -43,7 +43,7 @@ Attempting full verification using callout
callout cache: found domain record for two.test.ex
callout cache: no address record found for r11@???
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP(Connection timed out)<<
SMTP(close)>>
SMTP timeout
diff --git a/test/stderr/0476 b/test/stderr/0476
index 9e8e312..140ab77 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -19,7 +19,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@???)
set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO the.local.host.name
cmd buf flush ddd bytes
@@ -83,7 +83,7 @@ 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@???)
set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@???)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 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@???: result DEFER
diff --git a/test/stderr/0512 b/test/stderr/0512
index 56e1e78..ed39fb9 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -15,7 +15,7 @@ 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@???)
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]:1224 ... 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
@@ -26,7 +26,7 @@ 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@???)
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]:1224 ... 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
@@ -37,7 +37,7 @@ 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@???)
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]:1224 ... 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
@@ -48,7 +48,7 @@ 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@???)
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]:1224 ... 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
@@ -102,7 +102,7 @@ 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@???)
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]:1224 ... 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
@@ -113,7 +113,7 @@ 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@???)
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]:1224 ... 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
diff --git a/test/stderr/0525 b/test/stderr/0525
index a153085..21bc7e0 100644
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -3,7 +3,7 @@ LOG: smtp_connection MAIN
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 Welcome
SMTP>> EHLO myhost.test.ex
SMTP<< 250 Hi
diff --git a/test/stderr/0578 b/test/stderr/0578
index 55525fc..5e3412f 100644
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -12,7 +12,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -62,7 +62,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
created log directory TESTSUITE/spool/log
@@ -85,7 +85,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -143,7 +143,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -199,7 +199,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -263,7 +263,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -321,7 +321,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -373,7 +373,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -425,7 +425,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -490,7 +490,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -531,7 +531,7 @@ callout cache: found domain record for otherhost21
callout cache: domain accepts RCPT TO:<postmaster@domain>
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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -564,7 +564,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -604,7 +604,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -637,7 +637,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -676,7 +676,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -711,7 +711,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -752,7 +752,7 @@ Attempting full verification using callout
callout cache: no domain record found for x.y.z
callout cache: no address record found for abcd@???/<somesender@???>
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -788,7 +788,7 @@ Attempting full verification using callout
callout cache: found domain record for x.y.z
callout cache: no address record found for abcd@???
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -821,7 +821,7 @@ 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -863,7 +863,7 @@ Attempting full verification using callout
callout cache: no domain record found for test.ex
callout cache: no address record found for z@???/<postmaster@???>
interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
diff --git a/test/stderr/2008 b/test/stderr/2008
index 3ce6ddf..9f716c3 100644
--- a/test/stderr/2008
+++ b/test/stderr/2008
@@ -1,7 +1,7 @@
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
@@ -33,7 +33,7 @@ LOG: MAIN
LOG: MAIN
Completed
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
@@ -66,7 +66,7 @@ LOG: MAIN
=> CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
LOG: MAIN
-> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
+Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
diff --git a/test/stderr/2035 b/test/stderr/2035
index e62f0bb..4359c4a 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -4,7 +4,7 @@ admin user
LOG: smtp_connection MAIN
SMTP connection from CALLER
Transport port=25 replaced by host-specific port=1225
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/2108 b/test/stderr/2108
index 74ed851..47f0578 100644
--- a/test/stderr/2108
+++ b/test/stderr/2108
@@ -1,7 +1,7 @@
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
@@ -37,7 +37,7 @@ LOG: MAIN
LOG: MAIN
Completed
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
@@ -74,7 +74,7 @@ LOG: MAIN
=> CALLER@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
LOG: MAIN
-> xyz@??? R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
+Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
diff --git a/test/stderr/2135 b/test/stderr/2135
index e62f0bb..4359c4a 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -4,7 +4,7 @@ admin user
LOG: smtp_connection MAIN
SMTP connection from CALLER
Transport port=25 replaced by host-specific port=1225
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/3404 b/test/stderr/3404
index 361f9fd..a35594e 100644
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,7 @@
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -26,7 +26,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
@@ -51,7 +51,7 @@ LOG: MAIN
LOG: MAIN
<= CALLER@??? 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]:1224 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250-OK
diff --git a/test/stderr/5410 b/test/stderr/5410
index 5774680..7978a02 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -49,7 +49,7 @@ domain.com in "! +local_domains"? yes (end of list)
├──expanding: $local_part
╰─────result: userx
domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
╭considering: $primary_hostname
├──expanding: $primary_hostname
╰─────result: myhost.test.ex
@@ -316,7 +316,7 @@ domain.com in "! +local_domains"? yes (end of list)
├──expanding: $local_part
╰─────result: usery
domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
╭considering: $primary_hostname
├──expanding: $primary_hostname
╰─────result: myhost.test.ex
@@ -552,7 +552,7 @@ domain.com in "! +local_domains"? yes (end of list)
├──expanding: $local_part
╰─────result: usery
domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
╭considering: $primary_hostname
├──expanding: $primary_hostname
╰─────result: myhost.test.ex
diff --git a/test/stderr/5420 b/test/stderr/5420
index 39e9632..9b51bff 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -49,7 +49,7 @@ domain.com in "! +local_domains"? yes (end of list)
├──expanding: $local_part
╰─────result: userx
domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
╭considering: $primary_hostname
├──expanding: $primary_hostname
╰─────result: myhost.test.ex
@@ -317,7 +317,7 @@ domain.com in "! +local_domains"? yes (end of list)
├──expanding: $local_part
╰─────result: usery
domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
╭considering: $primary_hostname
├──expanding: $primary_hostname
╰─────result: myhost.test.ex
@@ -553,7 +553,7 @@ domain.com in "! +local_domains"? yes (end of list)
├──expanding: $local_part
╰─────result: usery
domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
╭considering: $primary_hostname
├──expanding: $primary_hostname
╰─────result: myhost.test.ex
