diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2023-01-18 11:34:07 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2023-01-19 17:34:28 +0000 |
| commit | aae673d7db4b26e8c4a8cc3d59fe94de4c47ba16 (patch) | |
| tree | 398b3672681ecd0664cb79397f2001fea59b9c76 /test/stderr | |
| parent | d23b36cd691de33b709eae04f6f100272a8081eb (diff) | |
Logging: Add "D=" to more connection closure log lines. Bug 2434
Diffstat (limited to 'test/stderr')
52 files changed, 169 insertions, 169 deletions
diff --git a/test/stderr/0021 b/test/stderr/0021 index f896eddde..23c5b0cca 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -153,7 +153,7 @@ LOG: PANIC accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored Exim version x.yz .... @@ -295,7 +295,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT diff --git a/test/stderr/0022 b/test/stderr/0022 index e988c467e..8a2bb0bc4 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -75,7 +75,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -158,7 +158,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -242,7 +242,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? @@ -277,7 +277,7 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibl >>> drop: condition test succeeded in ACL "drop" >>> end of ACL "drop": DROP LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped -LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL +LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by DROP in ACL >>> host in hosts_connection_nolog? >>> list element: >>> list element: 127.0.0.1 @@ -303,7 +303,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> defer: condition test succeeded in ACL "defer_senders" >>> end of ACL "defer_senders": DEFER LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y> -LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT +LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT >>> host in hosts_connection_nolog? >>> list element: >>> list element: 127.0.0.1 @@ -336,7 +336,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> processing "accept" (TESTSUITE/test-config 63) >>> accept: condition test succeeded in ACL "delay_warn" >>> end of ACL "delay_warn": ACCEPT -LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT +LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT >>> host in hosts_connection_nolog? >>> list element: >>> list element: 127.0.0.1 @@ -396,7 +396,7 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A >>> deny: condition test succeeded in ACL "host_check2" >>> end of ACL "host_check2": DENY LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message< -LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT +LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN @@ -424,7 +424,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>> host in hosts_connection_nolog? >>> list element: >>> list element: 127.0.0.1 @@ -452,7 +452,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> accept: condition test yielded "drop" in ACL "nested_drop" >>> accept: endpass encountered - denying access LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped -LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL +LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by DROP in ACL >>> host in hosts_connection_nolog? >>> list element: >>> list element: 127.0.0.1 @@ -480,6 +480,6 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> require: condition test yielded "drop" in ACL "nested_drop_require" >>> end of ACL "nested_drop_require": not OK LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped -LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL +LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by DROP in ACL ******** SERVER ******** diff --git a/test/stderr/0044 b/test/stderr/0044 index f9fdd4a38..b4ff34a26 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -168,7 +168,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from (exim.test.ex) [V4NET.11.12.13] closed by QUIT + SMTP connection from (exim.test.ex) [V4NET.11.12.13] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (option unset) diff --git a/test/stderr/0092 b/test/stderr/0092 index 740e09a02..20d18d9b8 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -6,7 +6,7 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) -LOG: SMTP command timeout on connection from [V4NET.0.0.1] +LOG: SMTP command timeout on connection from [V4NET.0.0.1] D=qqs >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -43,7 +43,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> +LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> D=qqs Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 @@ -155,7 +155,7 @@ SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called LOG: lost_incoming_connection MAIN - SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> + SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> D=qqs SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection. search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> @@ -205,7 +205,7 @@ exim: timed out while reading - message abandoned >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address -LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1] +LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1] D=qqs An error was detected while processing a file of BSMTP input. The error message was: diff --git a/test/stderr/0094 b/test/stderr/0094 index bd87a6bcd..f809c7caa 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -208,6 +208,6 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] closed by QUIT + SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0227 b/test/stderr/0227 index 827d68e47..e45edf686 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -13,11 +13,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(close)>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250' LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -37,7 +37,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -57,7 +57,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -75,7 +75,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -94,7 +94,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -112,7 +112,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -130,7 +130,7 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -149,7 +149,7 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550-:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -167,7 +167,7 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused @@ -175,7 +175,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_S ... failed: Connection r LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -193,7 +193,7 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -211,7 +211,7 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -236,7 +236,7 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -263,7 +263,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -281,7 +281,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:QUIT:250' LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -301,7 +301,7 @@ cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:QUIT:250' LOG: MAIN REJECT H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -321,7 +321,7 @@ cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:QUIT:250' LOG: MAIN REJECT H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -347,7 +347,7 @@ cmdlog: '220:EHLO:250-:MAIL:250:RCPT:550:RSET:250:MAIL:250:RCPT:250:QUIT:250' LOG: MAIN REJECT H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -365,7 +365,7 @@ cmdlog: '220:LHLO:250:MAIL:250:RCPT:550:QUIT:250' LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -377,7 +377,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused @@ -386,4 +386,4 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT diff --git a/test/stderr/0230 b/test/stderr/0230 index 9017df8f2..e046d9022 100644 --- a/test/stderr/0230 +++ b/test/stderr/0230 @@ -7,6 +7,6 @@ LOG: SMTP connection from [192.168.1.2]:1117 >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) -LOG: SMTP connection from [192.168.1.2]:1117 closed by QUIT +LOG: SMTP connection from [192.168.1.2]:1117 D=qqs closed by QUIT ******** SERVER ******** diff --git a/test/stderr/0275 b/test/stderr/0275 index 0bef81f35..46fdda55d 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -596,6 +596,6 @@ LOG: MAIN REJECT SMTP<< QUIT SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [127.0.0.1] closed by QUIT + SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0277 b/test/stderr/0277 index f57c5c50f..12c462e56 100644 --- a/test/stderr/0277 +++ b/test/stderr/0277 @@ -47,7 +47,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.2.3.4] closed by QUIT + SMTP connection from [V4NET.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -106,7 +106,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.6.7.8] closed by QUIT + SMTP connection from [V4NET.6.7.8] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -176,7 +176,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.10.11.12] closed by QUIT + SMTP connection from [V4NET.10.11.12] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -246,7 +246,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.1.1.1] closed by QUIT + SMTP connection from [V4NET.1.1.1] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -310,6 +310,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.2.2.2] closed by QUIT + SMTP connection from [V4NET.2.2.2] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0293 b/test/stderr/0293 index f12b83795..4a1ab718a 100644 --- a/test/stderr/0293 +++ b/test/stderr/0293 @@ -14,10 +14,10 @@ LOG: delay_delivery MAIN LOG: MAIN REJECT rejected MAIL command U=CALLER: too many messages in one connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN REJECT rejected MAIL command U=CALLER: too many messages in one connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT diff --git a/test/stderr/0294 b/test/stderr/0294 index 3aea3bbc8..6dac79140 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -93,7 +93,7 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -152,7 +152,7 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -212,7 +212,7 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -275,5 +275,5 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0303 b/test/stderr/0303 index 02875c77d..6c8b6a5d8 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -128,7 +128,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT + SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -208,6 +208,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT + SMTP connection from host.name.tld [V4NET.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0362 b/test/stderr/0362 index 868422d53..35e64615b 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -119,6 +119,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.0.0.0] closed by QUIT + SMTP connection from (test) [V4NET.0.0.0] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0371 b/test/stderr/0371 index f926d4da0..4669445d0 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -149,6 +149,6 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (something) [V4NET.0.0.0] closed by QUIT + SMTP connection from (something) [V4NET.0.0.0] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0372 b/test/stderr/0372 index abec969e9..70b08f031 100644 --- a/test/stderr/0372 +++ b/test/stderr/0372 @@ -121,7 +121,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT ----- System filter ----- 1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand " acl_c0="$acl_c0"\n acl_c1="$acl_c1"\n acl_c2="$acl_c2"\n acl_c3="$acl_c3"\n acl_c4="$acl_c4"\n acl_c5="$acl_c5"\n acl_c6="$acl_c6"\n acl_c7="$acl_c7"\n acl_c8="$acl_c8"\n acl_c9="$acl_c9"\n acl_m0="$acl_m0"\n acl_m1="$acl_m1"\n acl_m2="$acl_m2"\n acl_m3="$acl_m3"\n acl_m4="$acl_m4"\n acl_m5="$acl_m5"\n acl_m6="$acl_m6"\n acl_m7="$acl_m7"\n acl_m8="$acl_m8"\n acl_m9="$acl_m9"\n acl_m_foo="$acl_m_foo"\n acl_m_bar="$acl_m_bar"\n acl_c_foo="$acl_c_foo"\n acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set) diff --git a/test/stderr/0376 b/test/stderr/0376 index 995eafc77..c8cd1b9da 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -28,7 +28,7 @@ wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 wrote positive callout cache address record for ok@localhost LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -45,7 +45,7 @@ callout cache: found domain record for localhost callout cache: found address record for ok@localhost callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -68,7 +68,7 @@ created log directory TESTSUITE/spool/log LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -104,7 +104,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -125,7 +125,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -158,7 +158,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -178,7 +178,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -221,7 +221,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -241,7 +241,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -280,7 +280,7 @@ wrote callout cache domain record for otherhost2: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok@otherhost2 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -298,7 +298,7 @@ callout cache: domain accepts RCPT TO:<postmaster@domain> callout cache: found address record for ok@otherhost2 callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -331,7 +331,7 @@ wrote callout cache domain record for otherhost3: LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1245 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -349,7 +349,7 @@ callout cache: domain accepts random addresses LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -382,7 +382,7 @@ wrote callout cache domain record for otherhost4: LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1247 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -400,7 +400,7 @@ callout cache: domain accepts random addresses LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1248 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -445,7 +445,7 @@ wrote callout cache domain record for otherhost41: result=1 postmaster=1 random=2 wrote positive callout cache address record for ok@otherhost41 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1249 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -464,7 +464,7 @@ callout cache: domain accepts RCPT TO:<postmaster@domain> callout cache: found address record for ok@otherhost41 callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1250 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -503,7 +503,7 @@ wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok@otherhost21 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1251 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -536,7 +536,7 @@ wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok2@otherhost21 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1252 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -574,7 +574,7 @@ wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 wrote positive callout cache address record for ok@otherhost31 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1253 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -607,7 +607,7 @@ wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 wrote positive callout cache address record for okok@otherhost31 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1254 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -645,7 +645,7 @@ wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 wrote positive callout cache address record for okokok@otherhost31 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1255 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -679,7 +679,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1256 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -718,7 +718,7 @@ wrote callout cache domain record for otherhost52: result=1 postmaster=1 random=0 wrote positive callout cache address record for okokok@otherhost52 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1257 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -753,7 +753,7 @@ wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain> LOG: MAIN <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1258 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -786,7 +786,7 @@ wrote callout cache domain record for x.y.z: LOG: MAIN <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1259 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -827,7 +827,7 @@ wrote callout cache domain record for otherhost9: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok@otherhost9 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -872,5 +872,5 @@ wrote callout cache domain record for test.ex: result=1 postmaster=1 random=2 wrote positive callout cache address record for z@test.ex/<postmaster@myhost.test.ex> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1261 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0381 b/test/stderr/0381 index 6ad38b6f8..550e2dab9 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -94,6 +94,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0386 b/test/stderr/0386 index 10cee1adf..e6aeda9e2 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -163,7 +163,7 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -607,6 +607,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0391 b/test/stderr/0391 index d77f0cef7..b7873266f 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -75,6 +75,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0396 b/test/stderr/0396 index 6e28e452f..75b64878a 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -37,6 +37,6 @@ created log directory TESTSUITE/spool/log SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0398 b/test/stderr/0398 index 12727cfc4..604e791b6 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -304,6 +304,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0432 b/test/stderr/0432 index 917279c1e..2722e6b34 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -146,7 +146,7 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -233,7 +233,7 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [1.2.3.4] closed by QUIT + SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (option unset) diff --git a/test/stderr/0435 b/test/stderr/0435 index 916f23c94..77e147981 100644 --- a/test/stderr/0435 +++ b/test/stderr/0435 @@ -20,6 +20,6 @@ SMTP>> 501 NUL characters are not allowed in SMTP commands SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0462 b/test/stderr/0462 index 446305178..470f2ed59 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -48,7 +48,7 @@ callout cache: found domain record for localhost callout cache: found address record for Ok@localhost callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -84,7 +84,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -118,5 +118,5 @@ wrote negative callout cache address record for NOTok2@elsewhere LOG: MAIN REJECT H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0464 b/test/stderr/0464 index f18276074..388539123 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -201,6 +201,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0465 b/test/stderr/0465 index bcf5f0393..8bd50d1cb 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -29,7 +29,7 @@ SMTP>> 501 <abc@domain.>: domain missing or malformed SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed) @@ -104,7 +104,7 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -173,6 +173,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0473 b/test/stderr/0473 index 21de8a28f..1e943d0e8 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -28,7 +28,7 @@ wrote callout cache domain record for two.test.ex: LOG: MAIN REJECT U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<r11@two.test.ex> LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -52,5 +52,5 @@ SMTP timeout LOG: MAIN REJECT U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after initial connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0479 b/test/stderr/0479 index 66f30eeba..64ff0acc0 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -95,6 +95,6 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN - SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT + SMTP connection from ([1.2.3.4]) [1.2.3.4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0483 b/test/stderr/0483 index 2839e479f..c38d537ea 100644 --- a/test/stderr/0483 +++ b/test/stderr/0483 @@ -26,5 +26,5 @@ routed by r1 router LOG: MAIN REJECT U=CALLER F=<sender@domain1> rejected RCPT <other@domain2> LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0487 b/test/stderr/0487 index 86af4dfec..fb2536a9b 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -204,6 +204,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0525 b/test/stderr/0525 index efa09eb19..61b939d46 100644 --- a/test/stderr/0525 +++ b/test/stderr/0525 @@ -21,4 +21,4 @@ LOG: MAIN LOG: MAIN == def@pqr R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written) LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT diff --git a/test/stderr/0544 b/test/stderr/0544 index 942ddcda5..271fb4604 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -463,5 +463,5 @@ LOG: smtp_connection MAIN ╰─────result: domain=recipient.domain/sender_domain=sender.domain ╰──(tainted) LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0575 b/test/stderr/0575 index f70f19cd1..95f8f0877 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -67,6 +67,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.0.0.0] closed by QUIT + SMTP connection from (test) [V4NET.0.0.0] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0578 b/test/stderr/0578 index 51166675c..d804df43b 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -30,7 +30,7 @@ wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 wrote positive callout cache address record for ok@localhost LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -47,7 +47,7 @@ callout cache: found domain record for localhost callout cache: found address record for ok@localhost callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -70,7 +70,7 @@ created log directory TESTSUITE/spool/log LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -108,7 +108,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -129,7 +129,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -166,7 +166,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -186,7 +186,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -231,7 +231,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -251,7 +251,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -292,7 +292,7 @@ wrote callout cache domain record for otherhost2: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok@otherhost2 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -310,7 +310,7 @@ callout cache: domain accepts RCPT TO:<postmaster@domain> callout cache: found address record for ok@otherhost2 callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -345,7 +345,7 @@ wrote callout cache domain record for otherhost3: LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1245 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -363,7 +363,7 @@ callout cache: domain accepts random addresses LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -398,7 +398,7 @@ wrote callout cache domain record for otherhost4: LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1247 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -416,7 +416,7 @@ callout cache: domain accepts random addresses LOG: MAIN (random) LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1248 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -463,7 +463,7 @@ wrote callout cache domain record for otherhost41: result=1 postmaster=1 random=2 wrote positive callout cache address record for ok@otherhost41 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1249 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -482,7 +482,7 @@ callout cache: domain accepts RCPT TO:<postmaster@domain> callout cache: found address record for ok@otherhost41 callout cache: address record is positive LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1250 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -523,7 +523,7 @@ wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok@otherhost21 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1251 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -558,7 +558,7 @@ wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok2@otherhost21 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1252 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -598,7 +598,7 @@ wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 wrote positive callout cache address record for ok@otherhost31 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1253 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -633,7 +633,7 @@ wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 wrote positive callout cache address record for okok@otherhost31 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1254 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -673,7 +673,7 @@ wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 wrote positive callout cache address record for okokok@otherhost31 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1255 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -709,7 +709,7 @@ LOG: MAIN REJECT LOG: MAIN REJECT H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1256 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -750,7 +750,7 @@ wrote callout cache domain record for otherhost52: result=1 postmaster=1 random=0 wrote positive callout cache address record for okokok@otherhost52 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1257 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -787,7 +787,7 @@ wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain> LOG: MAIN <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1258 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -822,7 +822,7 @@ wrote callout cache domain record for x.y.z: LOG: MAIN <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1259 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -865,7 +865,7 @@ wrote callout cache domain record for otherhost9: result=1 postmaster=1 random=0 wrote positive callout cache address record for ok@otherhost9 LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -912,5 +912,5 @@ wrote callout cache domain record for test.ex: result=1 postmaster=1 random=2 wrote positive callout cache address record for z@test.ex/<postmaster@myhost.test.ex> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1261 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0609 b/test/stderr/0609 index 676809138..8e99a3f7e 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -28,7 +28,7 @@ Listening... p1235 accept: condition test succeeded in ACL "delay4_accept" p1235 end of ACL "delay4_accept": ACCEPT p1235 LOG: smtp_connection MAIN -p1235 SMTP connection from (test) [127.0.0.1] closed by QUIT +p1235 SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> child p1235 ended: status=0x0 normal exit, 0 diff --git a/test/stderr/0620 b/test/stderr/0620 index 8b11e90f3..577a8771d 100644 --- a/test/stderr/0620 +++ b/test/stderr/0620 @@ -51,7 +51,7 @@ LOG: MAIN LOG: MAIN $0 'trythiskey.ex' $1 '' LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... environment after trimming: @@ -105,5 +105,5 @@ LOG: MAIN LOG: MAIN $0 'trythiskey.ex' $1 '' LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0628 b/test/stderr/0628 index 757d24dd7..215206a82 100644 --- a/test/stderr/0628 +++ b/test/stderr/0628 @@ -22,7 +22,7 @@ 01:01:01 p1237 SMTP<< QUIT 01:01:01 p1237 SMTP>> 221 myhost.test.ex closing connection 01:01:01 p1237 LOG: smtp_connection MAIN -01:01:01 p1237 SMTP connection from (test.ex) [127.0.0.1] closed by QUIT +01:01:01 p1237 SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT 01:01:01 p1239 Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=p1239 D=fff9ffff 01:01:01 p1239 macros_trusted overridden to true by whitelisting 01:01:01 p1239 changed uid/gid: forcing real = effective @@ -136,7 +136,7 @@ 01:01:01 p1240 SMTP<< QUIT 01:01:01 p1240 SMTP>> 221 myhost.test.ex closing connection 01:01:01 p1240 LOG: smtp_connection MAIN -01:01:01 p1240 SMTP connection from (test.ex) [127.0.0.1] closed by QUIT +01:01:01 p1240 SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT 01:01:01 p1240 search_tidyup called 01:01:01 p1240 SMTP>>(close on process exit) 01:01:01 p1240 >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0629 b/test/stderr/0629 index 16390eec3..96fdb14f3 100644 --- a/test/stderr/0629 +++ b/test/stderr/0629 @@ -13,7 +13,7 @@ LOG: PANIC SMTP<< QUIT SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test.ex) [127.0.0.1] closed by QUIT + SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT search_tidyup called SMTP>>(close on process exit) >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0632 b/test/stderr/0632 index 49eb5fa89..a65d074f4 100644 --- a/test/stderr/0632 +++ b/test/stderr/0632 @@ -459,7 +459,7 @@ LOG: MAIN search_tidyup called Process p1235 is ready for new message LOG: smtp_connection MAIN - SMTP connection from (test.ex) [127.0.0.1] closed by QUIT + SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT p1234 1 SMTP accept process running p1234 Listening... p1234 daemon_notification (from unknown addr) @@ -896,7 +896,7 @@ LOG: MAIN search_tidyup called Process p1236 is ready for new message LOG: smtp_connection MAIN - SMTP connection from (test.ex) [127.0.0.1] closed by QUIT + SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT p1234 1 SMTP accept process running p1234 Listening... search_tidyup called diff --git a/test/stderr/0911 b/test/stderr/0911 index b6ff35cca..55dff42df 100644 --- a/test/stderr/0911 +++ b/test/stderr/0911 @@ -63,7 +63,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -128,7 +128,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -196,7 +196,7 @@ LOG: MAIN == tempreject@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 451 Service not available >>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -266,7 +266,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -336,5 +336,5 @@ LOG: MAIN == dataloss@test.ex R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to pipelined end of data >>>>>>>>>>>>>>>> Exim pid=p1243 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN - SMTP connection from root closed by QUIT + SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2035 b/test/stderr/2035 index a0e5f374c..d2621e37f 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -35,7 +35,7 @@ sync_responses expect rcpt for userb@test.ex LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/2135 b/test/stderr/2135 index a0e5f374c..d2621e37f 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -35,7 +35,7 @@ sync_responses expect rcpt for userb@test.ex LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/2201 b/test/stderr/2201 index 6566cad54..927c7c6de 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -249,7 +249,7 @@ LOG: MAIN <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex Process p1238 is ready for new message LOG: smtp_connection MAIN - SMTP connection from localhost (myhost.test.ex) [127.0.0.1] closed by QUIT + SMTP connection from localhost (myhost.test.ex) [127.0.0.1] D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> p1235 child p1238 ended: status=0x0 p1235 normal exit, 0 diff --git a/test/stderr/2202 b/test/stderr/2202 index 8c2da8190..9cd2772a2 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -101,7 +101,7 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4] closed by QUIT + SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... diff --git a/test/stderr/2600 b/test/stderr/2600 index da02c5815..7d8e76824 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -260,7 +260,7 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -388,7 +388,7 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -505,7 +505,7 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.10.10.10] closed by QUIT + SMTP connection from (test) [10.10.10.10] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... diff --git a/test/stderr/2610 b/test/stderr/2610 index 7dd4b2953..435da7644 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -458,7 +458,7 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] D=qqs closed by QUIT search_tidyup called close MYSQL connection: 127.0.0.1:PORT_N/test/root >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2620 b/test/stderr/2620 index 2674d9e1d..2e0e38247 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -624,7 +624,7 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] D=qqs closed by QUIT search_tidyup called close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3000 b/test/stderr/3000 index 45103c44a..137ca11ef 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -67,7 +67,7 @@ LOG: smtp_connection MAIN LOG: MAIN this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) diff --git a/test/stderr/3400 b/test/stderr/3400 index b19b82bee..9d7bfaabd 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -690,6 +690,6 @@ SMTP>> 235 Authentication succeeded SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5204 b/test/stderr/5204 index 0a45e2047..63238c27c 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -283,5 +283,5 @@ end of inline ACL: implicit DENY LOG: MAIN REJECT H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL) LOG: smtp_connection MAIN - SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT + SMTP connection from (some.name) [V4NET.2.3.4] D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5410 b/test/stderr/5410 index 8e65e3feb..42c280a2e 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -588,7 +588,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... environment after trimming: @@ -1133,7 +1133,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... environment after trimming: @@ -1678,7 +1678,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/5420 b/test/stderr/5420 index 5caa8fcc0..3b7c2ca78 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -592,7 +592,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... environment after trimming: @@ -1141,7 +1141,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... environment after trimming: @@ -1690,7 +1690,7 @@ LOG: MAIN LOG: MAIN Completed LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** |