diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-06-17 11:21:05 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-06-17 11:22:15 +0100 |
| commit | 4da19af657ed2687d20c1eb8cf85a66a70804e2d (patch) | |
| tree | e171136a86f55c4f2acc62048b916ef45860a64b | |
| parent | 46cb87a295735ab4452ad1ca304f2c19ded2624c (diff) | |
| download | exim4-4da19af657ed2687d20c1eb8cf85a66a70804e2d.tar.gz | |
Testsuite: pid tracking
502 files changed, 2669 insertions, 2665 deletions
diff --git a/test/log/0005 b/test/log/0005 index 4a2d7de2e..6aae4ffa6 100644 --- a/test/log/0005 +++ b/test/log/0005 @@ -5,7 +5,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@the.local.host.name> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain U=CALLER P=local-smtp S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@the.local.host.name> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0022 b/test/log/0022 index a3a1c3ec5..fd7018bc8 100644 --- a/test/log/0022 +++ b/test/log/0022 @@ -11,7 +11,7 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Connections=1 1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL diff --git a/test/log/0033 b/test/log/0033 index 48618188c..c646a20ff 100644 --- a/test/log/0033 +++ b/test/log/0033 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => one@remote <list@test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> two@remote <list@test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmaY-0005vi-00 => one@remote <list@test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 -> two@remote <list@test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1235 -qq diff --git a/test/log/0035 b/test/log/0035 index 01bca50a0..ed812abba 100644 --- a/test/log/0035 +++ b/test/log/0035 @@ -1,12 +1,12 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= notsubmit@y H=(rhu.barb) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@y H=(rhu.barb) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=(rhu.barb) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= notsubmit@y H=(rhu.barb) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 <= a@y H=(rhu.barb) [127.0.0.1] P=esmtp S=sss -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 <= a@y H=(rhu.barb) [127.0.0.1] P=esmtp S=sss -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbD-0005vi-00 <= a@y H=(rhu.barb) [127.0.0.1] P=esmtp S=sss diff --git a/test/log/0036 b/test/log/0036 index 97725f4c9..ee502d6aa 100644 --- a/test/log/0036 +++ b/test/log/0036 @@ -1,15 +1,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => abcd@eximtesthost.test.ex <abcd@eximtesthost> R=lookuphost T=send_to_server H=eximtesthost.test.ex [ip4.ip4.ip4.ip4] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx@alias-eximtesthost.test.ex R=lookuphost T=send_to_server H=eximtesthost.test.ex [ip4.ip4.ip4.ip4] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@eximtesthost.test.ex R=server T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@alias-eximtesthost.test.ex R=server T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/0037 b/test/log/0037 index 946e413f3..da6432528 100644 --- a/test/log/0037 +++ b/test/log/0037 @@ -98,18 +98,18 @@ 1999-03-02 09:44:33 10HmbT-0005vi-00 Completed 1999-03-02 09:44:33 10HmbS-0005vi-00 => >CALLER@test.ex <filter-vdefaults@test.ex> R=userfilter T=address_reply 1999-03-02 09:44:33 10HmbS-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbA-0005vi-00 Message is frozen -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmbA-0005vi-00 Message is frozen -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qff +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 -qff 1999-03-02 09:44:33 10HmbA-0005vi-00 Unfrozen by forced delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 "should freeze this" not first delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=user_accept2 T=appendfile 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qff +1999-03-02 09:44:33 End queue run: pid=p1236 -qff 1999-03-02 09:44:33 10HmbU-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbU-0005vi-00 "should freeze this" first delivery 1999-03-02 09:44:33 10HmbU-0005vi-00 => userz <system-filter> R=user_accept1 T=appendfile @@ -118,12 +118,12 @@ 1999-03-02 09:44:33 10HmbV-0005vi-00 => postmaster <postmaster@test.ex> R=user_accept1 T=appendfile 1999-03-02 09:44:33 10HmbV-0005vi-00 Completed 1999-03-02 09:44:33 10HmbU-0005vi-00 Frozen by the system filter: subject was "should freeze this"\nHere are two extra\nlines of text -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff -R userx +1999-03-02 09:44:33 Start queue run: pid=p1237 -qqff -R userx 1999-03-02 09:44:33 10HmbU-0005vi-00 Unfrozen by forced delivery 1999-03-02 09:44:33 10HmbU-0005vi-00 "should freeze this" not first delivery 1999-03-02 09:44:33 10HmbU-0005vi-00 => userx <userx@test.ex> R=user_accept2 T=appendfile 1999-03-02 09:44:33 10HmbU-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -R userx +1999-03-02 09:44:33 End queue run: pid=p1237 -qqff -R userx 1999-03-02 09:44:33 10HmbW-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbW-0005vi-00 "" first delivery 1999-03-02 09:44:33 10HmbW-0005vi-00 == readfile@test.ex R=fail_read_filter defer (-17): error in filter file: failed to expand "${readfile{TESTSUITE/test-private}}" in filter file: failed to open TESTSUITE/test-private: Permission denied (euid=CALLER_UID egid=CALLER_GID) diff --git a/test/log/0055 b/test/log/0055 index e8f7f97ac..1bc9312d8 100644 --- a/test/log/0055 +++ b/test/log/0055 @@ -7,31 +7,31 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 == xxx@local.test.ex routing defer (-56): domain is in queue_domains 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -ql +1999-03-02 09:44:33 Start queue run: pid=p1234 -ql 1999-03-02 09:44:33 10HmaZ-0005vi-00 *> xxx@local.test.ex R=localreally T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@myhost.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -ql -1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 -ql +1999-03-02 09:44:33 Start queue run: pid=p1235 +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbC-0005vi-00 == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbC-0005vi-00 *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1237 -qq 1999-03-02 09:44:33 10HmbD-0005vi-00 *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1237 -qq 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbF-0005vi-00 == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue 1999-03-02 09:44:33 10HmbF-0005vi-00 *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" diff --git a/test/log/0098 b/test/log/0098 index 5aed642ac..8f923e74e 100644 --- a/test/log/0098 +++ b/test/log/0098 @@ -1,17 +1,17 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmaX-0005vi-00 delayed 0 minutes" 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex R=alias defer (-1): This address has been forced to defer. @@ -19,11 +19,11 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmaZ-0005vi-00 delayed 0 minutes" 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (dd): Network Error -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmaX-0005vi-00 delayed 0 minutes" @@ -33,19 +33,19 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (dd): Network Error -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (dd): Connection refused -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (-54): retry time not reached for any host for 'some.domain' 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (-54): retry time not reached for any host for 'connection.refused' -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached @@ -53,8 +53,8 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (-54): retry time not reached for any host for 'some.domain' 1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (dd): Connection refused -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1238 +1999-03-02 09:44:33 Start queue run: pid=p1239 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router 1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmaX-0005vi-00 delayed by 10 minutes" @@ -75,7 +75,7 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbD-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmbD-0005vi-00 delayed by 0 minutes" 1999-03-02 09:44:33 10HmbH-0005vi-00 => CALLER <CALLER@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1239 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 removed by CALLER @@ -86,43 +86,43 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbI-0005vi-00 == defer@another.test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1240 -qf 1999-03-02 09:44:33 10HmbI-0005vi-00 == defer@another.test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1240 -qf 1999-03-02 09:44:33 10HmbI-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbJ-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1241 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1241 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1242 -qf 1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1242 -qf 1999-03-02 09:44:33 10HmbK-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbL-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1243 -qf 1999-03-02 09:44:33 10HmbL-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer. -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1243 -qf 1999-03-02 09:44:33 10HmbL-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss T="testing a remote defer" 1999-03-02 09:44:33 10HmbM-0005vi-00 == rrrr@remote.defer R=remote_quota T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rrrr@remote.defer>: 451 Over-quota -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1244 1999-03-02 09:44:33 10HmbM-0005vi-00 == rrrr@remote.defer routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmbM-0005vi-00 delayed 0 minutes" 1999-03-02 09:44:33 10HmbN-0005vi-00 => CALLER <CALLER@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1244 1999-03-02 09:44:33 10HmbM-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1245, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<CALLER@test.ex> temporarily rejected RCPT <rrrr@remote.defer>: Over-quota diff --git a/test/log/0099 b/test/log/0099 index 71f462c27..db45c8b76 100644 --- a/test/log/0099 +++ b/test/log/0099 @@ -1,13 +1,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for userx@simple 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (dd): Connection refused -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (-54): retry time not reached for any host for 'simple' -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (dd): Connection refused -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for usery@complex 1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [ip4.ip4.ip4.ip4] Connection refused 1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [127.0.0.1] Connection refused diff --git a/test/log/0110 b/test/log/0110 index 6343c24fa..4c13135ec 100644 --- a/test/log/0110 +++ b/test/log/0110 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == second@test.ex <first@test.ex> R=first defer (-1): deferred by aliasfile -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => second <first@test.ex> R=deliver T=appendfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0113 b/test/log/0113 index bfda3fba6..95c7d54ca 100644 --- a/test/log/0113 +++ b/test/log/0113 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == second@test.ex <first@test.ex> R=second defer (-1): deferred by aliasfile -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => second <first@test.ex> R=deliver T=appendfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0116 b/test/log/0116 index 608b6684b..28219394d 100644 --- a/test/log/0116 +++ b/test/log/0116 @@ -7,7 +7,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => acopy <acopy@test.ex> R=deliver T=appendfile 1999-03-02 09:44:33 10HmaY-0005vi-00 => alias1 <acopy@test.ex> R=deliver T=appendfile 1999-03-02 09:44:33 10HmaY-0005vi-00 => alias2 <acopy@test.ex> R=deliver T=appendfile -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=alias defer (-1): forced to defer 1999-03-02 09:44:33 10HmaY-0005vi-00 == defer@test.ex R=alias defer (-1): forced to defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0118 b/test/log/0118 index 244c962a4..b9f9a8037 100644 --- a/test/log/0118 +++ b/test/log/0118 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=first defer (-1): force defer on first delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=second defer (-1): force defer on non-queue run -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=third T=appendfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0119 b/test/log/0119 index 838234ec7..2867f5d33 100644 --- a/test/log/0119 +++ b/test/log/0119 @@ -1,32 +1,32 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -R postmaster +1999-03-02 09:44:33 Start queue run: pid=p1234 -R postmaster 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -R postmaster -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -R postmaster +1999-03-02 09:44:33 End queue run: pid=p1234 -R postmaster +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf -R postmaster 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf -R postmaster -1999-03-02 09:44:33 Start queue run: pid=pppp -R postmaster +1999-03-02 09:44:33 End queue run: pid=p1235 -qf -R postmaster +1999-03-02 09:44:33 Start queue run: pid=p1236 -R postmaster 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -R postmaster -1999-03-02 09:44:33 Start queue run: pid=pppp -S postmaster -1999-03-02 09:44:33 End queue run: pid=pppp -S postmaster -1999-03-02 09:44:33 Start queue run: pid=pppp -S CALLER +1999-03-02 09:44:33 End queue run: pid=p1236 -R postmaster +1999-03-02 09:44:33 Start queue run: pid=p1237 -S postmaster +1999-03-02 09:44:33 End queue run: pid=p1237 -S postmaster +1999-03-02 09:44:33 Start queue run: pid=p1238 -S CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -S CALLER -1999-03-02 09:44:33 Start queue run: pid=pppp -Rr p[aeiou]st +1999-03-02 09:44:33 End queue run: pid=p1238 -S CALLER +1999-03-02 09:44:33 Start queue run: pid=p1239 -Rr p[aeiou]st 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -Rr p[aeiou]st -1999-03-02 09:44:33 Start queue run: pid=pppp -Sr CALLER|^post +1999-03-02 09:44:33 End queue run: pid=p1239 -Rr p[aeiou]st +1999-03-02 09:44:33 Start queue run: pid=p1240 -Sr CALLER|^post 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -Sr CALLER|^post -1999-03-02 09:44:33 Start queue run: pid=pppp -qq -Sr CALLER +1999-03-02 09:44:33 End queue run: pid=p1240 -Sr CALLER|^post +1999-03-02 09:44:33 Start queue run: pid=p1241 -qq -Sr CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qq -Sr CALLER -1999-03-02 09:44:33 Start queue run: pid=pppp -Sr ^10 -1999-03-02 09:44:33 End queue run: pid=pppp -Sr ^10 -1999-03-02 09:44:33 Start queue run: pid=pppp -R postmaster -S postmaster -1999-03-02 09:44:33 End queue run: pid=pppp -R postmaster -S postmaster -1999-03-02 09:44:33 Start queue run: pid=pppp -R master -S CALLER +1999-03-02 09:44:33 End queue run: pid=p1241 -qq -Sr CALLER +1999-03-02 09:44:33 Start queue run: pid=p1242 -Sr ^10 +1999-03-02 09:44:33 End queue run: pid=p1242 -Sr ^10 +1999-03-02 09:44:33 Start queue run: pid=p1243 -R postmaster -S postmaster +1999-03-02 09:44:33 End queue run: pid=p1243 -R postmaster -S postmaster +1999-03-02 09:44:33 Start queue run: pid=p1244 -R master -S CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -R master -S CALLER +1999-03-02 09:44:33 End queue run: pid=p1244 -R master -S CALLER diff --git a/test/log/0120 b/test/log/0120 index a01fb5712..448c34703 100644 --- a/test/log/0120 +++ b/test/log/0120 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == postmaster@test.ex R=force_defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 ** postmaster@test.ex R=force_fail: forced fail after d seconds 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=blackhole 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0135 b/test/log/0135 index 390b633ae..7bd0bc57f 100644 --- a/test/log/0135 +++ b/test/log/0135 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == c@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/c) 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d) 1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error @@ -11,12 +11,12 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=null 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@test.ex R=smart T=local_delivery defer (-53): Retry time not yet reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@unknown.ex R=default T=smtp defer (-54): retry time not reached for any host for 'unknown.ex' -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d) 1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@unknown.ex R=default T=smtp defer (dd): Network Error @@ -26,12 +26,12 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@test.ex> R=null 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error 1999-03-02 09:44:33 10HmbA-0005vi-00 == b@known.ex R=default T=smtp defer (dd): Network Error 1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@known.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmbA-0005vi-00 b@known.ex: error ignored 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 diff --git a/test/log/0137 b/test/log/0137 index 022c9de93..9b247b9d7 100644 --- a/test/log/0137 +++ b/test/log/0137 @@ -3,19 +3,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 <= t1@foo U=CALLER P=local S=sss T="Second" 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=smart T=local_delivery defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (lock file) -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= t2@foo U=CALLER P=local S=sss T="Third" 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@test.ex R=smart T=local_delivery_fcntl defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (fcntl/flock) -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery_fcntl 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbA-0005vi-00 <= t3@foo U=CALLER P=local S=sss T="Fourth" 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@test.ex R=smart T=local_delivery_fcntl_blocking defer (-9): failed to lock mailbox TESTSUITE/test-mail/userx (fcntl/flock) -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=smart T=local_delivery_fcntl_blocking 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/0154 b/test/log/0154 index f68775594..b4588af0d 100644 --- a/test/log/0154 +++ b/test/log/0154 @@ -8,7 +8,7 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmaY-0005vi-00 == b@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@test.ex R=defer_always defer (-1): forced defer @@ -19,4 +19,4 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 == h@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmbF-0005vi-00 == i@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmbG-0005vi-00 == j@test.ex R=defer_always defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0155 b/test/log/0155 index f68775594..b4588af0d 100644 --- a/test/log/0155 +++ b/test/log/0155 @@ -8,7 +8,7 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmaY-0005vi-00 == b@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@test.ex R=defer_always defer (-1): forced defer @@ -19,4 +19,4 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 == h@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmbF-0005vi-00 == i@test.ex R=defer_always defer (-1): forced defer 1999-03-02 09:44:33 10HmbG-0005vi-00 == j@test.ex R=defer_always defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0159 b/test/log/0159 index ad81f3651..8e08bf2ea 100644 --- a/test/log/0159 +++ b/test/log/0159 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 @@ -7,10 +7,10 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=([ip4.ip4.ip4.ip4]) [ip4.ip4.ip4.ip4] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=([IPV4:ip4.ip4.ip4.ip4]) [ip4.ip4.ip4.ip4] P=esmtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=(ip4.ip4.ip4.ip4) [ip4.ip4.ip4.ip4] P=esmtp S=sss diff --git a/test/log/0160 b/test/log/0160 index bb3c00f9a..dcbdd24c2 100644 --- a/test/log/0160 +++ b/test/log/0160 @@ -1,15 +1,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@domain.com>: 452 Temporary error -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@domain.com>: 452 Temporary error 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain.com: retry timeout exceeded 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@myhost.test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@myhost.test.ex: error ignored 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 diff --git a/test/log/0163 b/test/log/0163 index 37bfe210a..37269ab59 100644 --- a/test/log/0163 +++ b/test/log/0163 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456 -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-54): retry time not reached for any host for 'domain.com' -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0177 b/test/log/0177 index bbe8a089e..46931bcac 100644 --- a/test/log/0177 +++ b/test/log/0177 @@ -22,14 +22,14 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => >usery <userx@test.ex> R=filter T=autoreply 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmbA-0005vi-00 Message is frozen -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qff +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 -qff 1999-03-02 09:44:33 10HmbA-0005vi-00 Unfrozen by forced delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=all_L T=appendfile 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qff +1999-03-02 09:44:33 End queue run: pid=p1235 -qff 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 == userx@test.ex R=filter defer (-1): subject was "freeze this (2)" 1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=CALLER P=local S=sss @@ -37,11 +37,11 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 => >usery <userx@test.ex> R=filter T=autoreply 1999-03-02 09:44:33 10HmbE-0005vi-00 Frozen -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff -R userx +1999-03-02 09:44:33 Start queue run: pid=p1236 -qqff -R userx 1999-03-02 09:44:33 10HmbE-0005vi-00 Unfrozen by forced delivery 1999-03-02 09:44:33 10HmbE-0005vi-00 => userx <userx@test.ex> R=all_L T=appendfile 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -R userx +1999-03-02 09:44:33 End queue run: pid=p1236 -qqff -R userx 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbG-0005vi-00 == userz@test.ex R=filter defer (-1): subject was "freeze this (3)" 1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=CALLER P=local S=sss @@ -49,8 +49,8 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed 1999-03-02 09:44:33 10HmbG-0005vi-00 => >usery <userz@test.ex> R=filter T=autoreply 1999-03-02 09:44:33 10HmbG-0005vi-00 Frozen -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff -R userz +1999-03-02 09:44:33 Start queue run: pid=p1237 -qqff -R userz 1999-03-02 09:44:33 10HmbG-0005vi-00 Unfrozen by forced delivery 1999-03-02 09:44:33 10HmbG-0005vi-00 => userx@non.local.domain <userz@test.ex> R=all_R T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -R userz +1999-03-02 09:44:33 End queue run: pid=p1237 -qqff -R userz diff --git a/test/log/0179 b/test/log/0179 index b32ee2997..a74f058ec 100644 --- a/test/log/0179 +++ b/test/log/0179 @@ -1,18 +1,18 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@domain.com 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for abcd@domain.com -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]:PORT_S I=[127.0.0.1]:ppppp C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]:PORT_S* I=[127.0.0.1]:ppppp C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@domain.com -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after MAIL FROM:<>: 450 not right now, sorry 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@domain.com R=all T=smtp defer (-45) H=127.0.0.1 [127.0.0.1]:PORT_S I=[127.0.0.1]:ppppp: SMTP error from remote mail server after MAIL FROM:<>: 450 not right now, sorry -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1235 -qqf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qqf 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userz@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]:PORT_S I=[127.0.0.1]:ppppp: SMTP error from remote mail server after RCPT TO:<userz@domain.com>: 550 Recipient refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 userz@domain.com: error ignored 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1236 -qqf diff --git a/test/log/0182 b/test/log/0182 index 135a05d5f..946341e5a 100644 --- a/test/log/0182 +++ b/test/log/0182 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=defer defer (-1): first delivery -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=deliver T=appendfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0185 b/test/log/0185 index 7a46b5277..4a76e7217 100644 --- a/test/log/0185 +++ b/test/log/0185 @@ -1,8 +1,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex R=filter defer (-1): subject was "freeze this" 1999-03-02 09:44:33 10HmaX-0005vi-00 Frozen -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff -R usery +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqff -R usery 1999-03-02 09:44:33 10HmaX-0005vi-00 Unfrozen by forced delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@non.local.domain <usery@test.ex> R=all_R T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -R usery +1999-03-02 09:44:33 End queue run: pid=p1234 -qqff -R usery diff --git a/test/log/0195 b/test/log/0195 index 99111d92e..3ac047fbb 100644 --- a/test/log/0195 +++ b/test/log/0195 @@ -2,17 +2,17 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@myhost.test.ex R=defer defer (-1): forcibly deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@myhost.test.ex R=defer defer (-1): forcibly deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=defer defer (-1): forcibly deferred -1999-03-02 09:44:33 Start queue run: pid=pppp -R usery +1999-03-02 09:44:33 Start queue run: pid=p1234 -R usery 1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@myhost.test.ex R=defer defer (-1): forcibly deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@myhost.test.ex R=defer defer (-1): forcibly deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=defer defer (-1): forcibly deferred -1999-03-02 09:44:33 End queue run: pid=pppp -R usery +1999-03-02 09:44:33 End queue run: pid=p1234 -R usery 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@myhost.test.ex R=defer defer (-1): forcibly deferred 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery <usery@myhost.test.ex> R=all T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@myhost.test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@myhost.test.ex R=defer defer (-1): forcibly deferred -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/0196 b/test/log/0196 index 6161c31ba..61b05e67f 100644 --- a/test/log/0196 +++ b/test/log/0196 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0197 b/test/log/0197 index 838a47a15..9dc426a3c 100644 --- a/test/log/0197 +++ b/test/log/0197 @@ -10,7 +10,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == x@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' 1999-03-02 09:44:33 10HmaY-0005vi-00 == y@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' 1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (-54): retry time not reached for any host for 'elsewhere' -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@copy.domain R=passall T=pass_on defer (dd): Network Error @@ -18,4 +18,4 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == x@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 10HmaY-0005vi-00 == y@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (dd): Network Error -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0202 b/test/log/0202 index 24a1f79c6..3ef501572 100644 --- a/test/log/0202 +++ b/test/log/0202 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery @@ -11,4 +11,4 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0203 b/test/log/0203 index f94b0177d..57ae297e2 100644 --- a/test/log/0203 +++ b/test/log/0203 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: 550 Don't like that sender @@ -8,4 +8,4 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** CALLER@test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message) 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf diff --git a/test/log/0204 b/test/log/0204 index 38ce3403a..b81335955 100644 --- a/test/log/0204 +++ b/test/log/0204 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 *> userx <userx@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 *> userx <userx@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0206 b/test/log/0206 index 734c2d969..9548e0f58 100644 --- a/test/log/0206 +++ b/test/log/0206 @@ -5,17 +5,17 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 ** unknown@test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message) 1999-03-02 09:44:33 10HmaX-0005vi-00 frozen by root -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 Message is frozen 1999-03-02 09:44:33 10HmaY-0005vi-00 Unfrozen by errmsg timer 1999-03-02 09:44:33 10HmaY-0005vi-00 ** unknown@test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaY-0005vi-00 unknown@test.ex: error ignored 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by timeout_frozen_after 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** unknown@test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message) 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/0207 b/test/log/0207 index cb8dc2000..381b126df 100644 --- a/test/log/0207 +++ b/test/log/0207 @@ -5,7 +5,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 ** unknown@test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message) 1999-03-02 09:44:33 10HmaX-0005vi-00 frozen by root -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 cancelled by timeout_frozen_after 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** unknown@test.ex: Unrouteable address @@ -13,4 +13,4 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 cancelled by timeout_frozen_after 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0209 b/test/log/0209 index ad5f24c4e..7f5069ce2 100644 --- a/test/log/0209 +++ b/test/log/0209 @@ -2,10 +2,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userz@domain1>: 450 Temporary error 1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 removed by CALLER @@ -16,22 +16,22 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@domain1>: 450 Temporary error 1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 450 Temporary error 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection refused diff --git a/test/log/0211 b/test/log/0211 index ac647a67b..07f84b6f2 100644 --- a/test/log/0211 +++ b/test/log/0211 @@ -3,24 +3,24 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy 1999-03-02 09:44:33 Test: temp-rej helo -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 Test: drop conn after banner -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: Remote host closed connection in response to EHLO the.local.host.name 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-18) H=localhost4.test.ex [127.0.0.1]: Remote host closed connection in response to EHLO the.local.host.name -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 Test: reject connect -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away (A) 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F=<CALLER@test.ex> R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away (A) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> F=<> R=all T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf 1999-03-02 09:44:33 Test: reject helo 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away (C) @@ -35,8 +35,8 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 H=localhost4.test.ex [127.0.0.1]: Remote host closed connection in response to HELO the.local.host.name (EHLO response was: 550 You are banned) 1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@domain1 R=others T=smtp defer (-18) H=localhost4.test.ex [127.0.0.1]: Remote host closed connection in response to HELO the.local.host.name (EHLO response was: 550 You are banned) 1999-03-02 09:44:33 Test: smtp-reject conn on 1MX, timeout TCP conn on 2MX -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 554 no smtp service here 1999-03-02 09:44:33 10HmbB-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP timeout after initial connection: Connection timed out 1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection timed out H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP timeout after initial connection -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1237 -qf diff --git a/test/log/0214 b/test/log/0214 index 685bccb1d..def95ba26 100644 --- a/test/log/0214 +++ b/test/log/0214 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address diff --git a/test/log/0216 b/test/log/0216 index 8f4f60032..ae3c89ca3 100644 --- a/test/log/0216 +++ b/test/log/0216 @@ -505,6 +505,6 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp L S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp L- S=sss id=E10HmaZ-0005vi-00@myhost.test.ex diff --git a/test/log/0218 b/test/log/0218 index c824726f8..3e8531c87 100644 --- a/test/log/0218 +++ b/test/log/0218 @@ -1,22 +1,22 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmbA-0005vi-00 == b@test.ex R=client T=send_to_server defer (dd): Connection refused -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qqf 1999-03-02 09:44:33 10HmbB-0005vi-00 ** CALLER@test.ex F=<> R=bounce: just discard 1999-03-02 09:44:33 10HmbB-0005vi-00 CALLER@test.ex: error ignored 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed @@ -25,4 +25,4 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1236 -qqf diff --git a/test/log/0224 b/test/log/0224 index 317f22cb6..0a84533fc 100644 --- a/test/log/0224 +++ b/test/log/0224 @@ -9,11 +9,11 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 == hdefer@test.ex <useryy@test.ex> R=halias defer (-1): not just yet 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex <userxy@test.ex> R=alias defer (-1): not just yet 1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@test.ex> R=alias T=address_file defer (EEE): Permission denied: failed to create directories for /no/such/file: Permission denied -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 == hdefer@test.ex <useryy@test.ex> R=halias defer (-1): not just yet 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex <userxy@test.ex> R=alias defer (-1): not just yet 1999-03-02 09:44:33 10HmaZ-0005vi-00 == /no/such/file <file@test.ex> R=alias T=address_file defer (EEE): Permission denied: failed to create directories for /no/such/file: Permission denied 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0230 b/test/log/0230 index 59e94c4ee..026de6ad7 100644 --- a/test/log/0230 +++ b/test/log/0230 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 SMTP connection from root 1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y.x H=(test) [V4NET.9.8.7]:1111 U=root P=smtp S=sss 1999-03-02 09:44:33 SMTP connection from root closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x <x@test.ex> R=server T=local_delivery @@ -10,17 +10,17 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 => x <x@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 SMTP connection from root 1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y.x H=(test) [V4NET.9.8.7]:1112 U=root P=smtp S=sss 1999-03-02 09:44:33 SMTP connection from root closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 => x@test.ex R=to_server T=remote H=127.0.0.1 [127.0.0.1] I=[127.0.0.1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y.x H=(test) [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss 1999-03-02 09:44:33 SMTP connection from (test) [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT @@ -30,7 +30,7 @@ 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= x@y.x H=(rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss 1999-03-02 09:44:33 SMTP connection from (rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1116 I=[127.0.0.1]:PORT_D (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y.x H=localhost (myhost.test.ex) [127.0.0.1]:1116 I=[127.0.0.1]:PORT_D P=esmtp S=sss 1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1116 I=[127.0.0.1]:PORT_D closed by QUIT diff --git a/test/log/0241 b/test/log/0241 index c5776cbff..d10d03159 100644 --- a/test/log/0241 +++ b/test/log/0241 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory 1999-03-02 09:44:33 10HmaX-0005vi-00 == >postmaster <system-filter> T=address_reply defer (0): Failed to send message from address_reply transport (127) 1999-03-02 09:44:33 10HmaX-0005vi-00 Frozen by the system filter: everything's freezing today -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 unfrozen by CALLER -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=all T=local 1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory 1999-03-02 09:44:33 10HmaX-0005vi-00 == >postmaster <system-filter> T=address_reply defer (0): Failed to send message from address_reply transport (127) -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0247 b/test/log/0247 index d591c41e7..598ec3a0a 100644 --- a/test/log/0247 +++ b/test/log/0247 @@ -2,6 +2,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == other@myhost.test.ex R=d2 defer (-1): explicit defer 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <blackhole@myhost.test.ex> R=d1 1999-03-02 09:44:33 10HmaX-0005vi-00 => /dev/null <devnull@myhost.test.ex> R=d1 T=**bypassed** -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == other@myhost.test.ex routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0251 b/test/log/0251 index 6161c31ba..61b05e67f 100644 --- a/test/log/0251 +++ b/test/log/0251 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0260 b/test/log/0260 index bbde3046d..e1f89bc3b 100644 --- a/test/log/0260 +++ b/test/log/0260 @@ -6,11 +6,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 10HmaX-0005vi-00 == exp.fail@test.ex R=exp_fail T=exp_fail defer (-27): home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=good T=local_delivery -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return@test.ex R=bad_return T=bad_return defer (-27): Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-27): Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.uid@test.ex R=bad_uid T=bad_uid defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bad_uid.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID) 1999-03-02 09:44:33 10HmaX-0005vi-00 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" 1999-03-02 09:44:33 10HmaX-0005vi-00 == exp.fail@test.ex R=exp_fail T=exp_fail defer (-27): home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0261 b/test/log/0261 index c3b7875d2..4bd9a688f 100644 --- a/test/log/0261 +++ b/test/log/0261 @@ -3,8 +3,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set 1999-03-02 09:44:33 10HmaX-0005vi-00 *> userx@test.ex R=good T=remote_delivery H=V4NET.0.0.1 [V4NET.0.0.1] C="delivery bypassed by -N option" -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" 1999-03-02 09:44:33 10HmaX-0005vi-00 == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0264 b/test/log/0264 index ba4db7549..bebcc185c 100644 --- a/test/log/0264 +++ b/test/log/0264 @@ -4,22 +4,22 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery <usery@test.ex> R=r1 T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=local_delivery defer (-53): Retry time not yet reached 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz <userz@test.ex> R=r1 T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 == notuser@test.ex R=r2 T=local_delivery2 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/notuser) 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 == notuser2@test.ex R=r2 T=local_delivery2 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/notuser2) 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=local_delivery defer (-53): Retry time not yet reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == notuser@test.ex R=r2 T=local_delivery2 defer (-53): Retry time not yet reached 1999-03-02 09:44:33 10HmbB-0005vi-00 == notuser2@test.ex R=r2 T=local_delivery2 defer (-53): Retry time not yet reached 1999-03-02 09:44:33 10HmbC-0005vi-00 == notuser3@test.ex R=r2 T=local_delivery2 defer (-53): Retry time not yet reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 removed by CALLER @@ -31,10 +31,10 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbD-0005vi-00 == r3.a@outside R=r3 defer (-1): not just now 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 == r3.a@outside routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbE-0005vi-00 == r3.b@outside R=r3 defer (-1): not just now -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 removed by CALLER @@ -42,10 +42,10 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbF-0005vi-00 == r4.a@outside R=r4 defer (-1): not just now 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbF-0005vi-00 == r4.a@outside routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbG-0005vi-00 == r4.b@outside R=r4 defer (-1): not just now -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbH-0005vi-00 == r5.a@r5domain.ex R=r5 defer (-1): not just now 1999-03-02 09:44:33 10HmbF-0005vi-00 removed by CALLER @@ -58,7 +58,7 @@ 1999-03-02 09:44:33 10HmbI-0005vi-00 == rz.a@outside R=r_remain defer (-1): not just now 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbJ-0005vi-00 == rz.b@outside R=r_remain defer (-1): not just now -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbI-0005vi-00 == rz.a@outside routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbJ-0005vi-00 == rz.b@outside routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 diff --git a/test/log/0282 b/test/log/0282 index 93ea60ff8..f7bafce60 100644 --- a/test/log/0282 +++ b/test/log/0282 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:{1225,1226,1228} [ip4.ip4.ip4.ip4]:PORT_D3 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on [127.0.0.1]:{1225,1226,1228} [ip4.ip4.ip4.ip4]:PORT_D3 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1]:1111 I=[127.0.0.1]:PORT_D P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:PORT_D2 P=esmtp S=sss diff --git a/test/log/0285 b/test/log/0285 index b50fd3fa7..7828219ce 100644 --- a/test/log/0285 +++ b/test/log/0285 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK @@ -10,9 +10,9 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK @@ -25,4 +25,4 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/0286 b/test/log/0286 index 3fc3b5469..5a8336326 100644 --- a/test/log/0286 +++ b/test/log/0286 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1" 1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK @@ -8,13 +8,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 3" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@test.ex>: 550 Recipient not OK 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Recipient not OK 1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4" @@ -25,8 +25,8 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5" 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 diff --git a/test/log/0287 b/test/log/0287 index c97f85ec3..342976f50 100644 --- a/test/log/0287 +++ b/test/log/0287 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 ETRN one received from (rhu.barb) [127.0.0.1] 1999-03-02 09:44:33 ETRN one received from (rhu.barb) [127.0.0.1] 1999-03-02 09:44:33 ETRN two received from (rhu.barb) [127.0.0.1] diff --git a/test/log/0288 b/test/log/0288 index 15c17f77c..10d8cf914 100644 --- a/test/log/0288 +++ b/test/log/0288 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == b@test.ex R=all T=smtp defer (-54): connection limit reached for all hosts for 'test.ex' 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/0300 b/test/log/0300 index 63ab2fffa..70df0f463 100644 --- a/test/log/0300 +++ b/test/log/0300 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail fr<suppressed> 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=r1 @@ -13,5 +13,5 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(dis.able) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=r1 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP protocol synchronization error (input sent without waiting for greeting): rejected connection from H=[127.0.0.1] input="helo abcd\r\n" diff --git a/test/log/0301 b/test/log/0301 index 2455bf443..afd5935d1 100644 --- a/test/log/0301 +++ b/test/log/0301 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(en.force) [127.0.0.1] next input="the mes<suppressed> diff --git a/test/log/0302 b/test/log/0302 index 34f6f8a7c..b5ab9c352 100644 --- a/test/log/0302 +++ b/test/log/0302 @@ -1,15 +1,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qi +1999-03-02 09:44:33 Start queue run: pid=p1234 -qi 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@myhost.test.ex R=r1 defer (-1): forced defer 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <abcd@myhost.test.ex> R=r2 -1999-03-02 09:44:33 End queue run: pid=pppp -qi +1999-03-02 09:44:33 End queue run: pid=p1234 -qi 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qi +1999-03-02 09:44:33 Start queue run: pid=p1235 -qi 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <wxyz@myhost.test.ex> R=r2 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qi -1999-03-02 09:44:33 Start queue run: pid=pppp -qif -1999-03-02 09:44:33 End queue run: pid=pppp -qif -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qi +1999-03-02 09:44:33 Start queue run: pid=p1236 -qif +1999-03-02 09:44:33 End queue run: pid=p1236 -qif +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@myhost.test.ex R=r1 defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1237 -qf diff --git a/test/log/0314 b/test/log/0314 index 898f56e8a..4528672ba 100644 --- a/test/log/0314 +++ b/test/log/0314 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 refused connection from [127.0.0.1] (host_reject_connection) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0332 b/test/log/0332 index 7e64fd454..e5e08a7b7 100644 --- a/test/log/0332 +++ b/test/log/0332 @@ -3,10 +3,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns R=r2 defer (-1): host lookup did not complete 1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@no.delay R=r1 T=t1 defer (0): SMTP delivery explicitly queued -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer 1999-03-02 09:44:33 10HmaY-0005vi-00 => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0336 b/test/log/0336 index fbf6d469b..128dee00f 100644 --- a/test/log/0336 +++ b/test/log/0336 @@ -1,16 +1,16 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -R userx +1999-03-02 09:44:33 Start queue run: pid=p1234 -R userx 1999-03-02 09:44:33 10HmaX-0005vi-00 *> userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -R userx +1999-03-02 09:44:33 End queue run: pid=p1234 -R userx 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 *> userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/0338 b/test/log/0338 index a926227ca..f8522df1b 100644 --- a/test/log/0338 +++ b/test/log/0338 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == a1-userx@test.ex <userx@test.ex> R=defer defer (-1): forced defer 1999-03-02 09:44:33 10HmaX-0005vi-00 => a2-userx <userx@test.ex> R=accept T=t1 -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => a1-userx <userx@test.ex> R=accept T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0341 b/test/log/0341 index e6ac0bad0..0fb74e2dd 100644 --- a/test/log/0341 +++ b/test/log/0341 @@ -1,16 +1,16 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=local T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery <usery@test.ex> R=local T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@xxx R=remote T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 -> usery@xxx R=remote T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= mailmaster@xxx H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex diff --git a/test/log/0345 b/test/log/0345 index f5e71d1e8..ffae3b406 100644 --- a/test/log/0345 +++ b/test/log/0345 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/a) -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/a) 1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == CALLER@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/CALLER) 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 == CALLER@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/CALLER) -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0357 b/test/log/0357 index 4e52b844a..ba6ee4a60 100644 --- a/test/log/0357 +++ b/test/log/0357 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 diff --git a/test/log/0358 b/test/log/0358 index 86351c377..670728d21 100644 --- a/test/log/0358 +++ b/test/log/0358 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0360 b/test/log/0360 index 263e97f5d..f7656da9c 100644 --- a/test/log/0360 +++ b/test/log/0360 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex <cms@test.ex> R=r2 defer (-1): Forcibly deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option" -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex <cms@test.ex> R=r2 defer (-1): Forcibly deferred -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0366 b/test/log/0366 index 62afef028..7a2d3487a 100644 --- a/test/log/0366 +++ b/test/log/0366 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network Error -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error @@ -22,6 +22,6 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@test.ex: error ignored 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/0367 b/test/log/0367 index f75a20173..83decc43f 100644 --- a/test/log/0367 +++ b/test/log/0367 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK" @@ -11,4 +11,4 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf diff --git a/test/log/0372 b/test/log/0372 index 034cdf9bf..877cbfe97 100644 --- a/test/log/0372 +++ b/test/log/0372 @@ -8,5 +8,5 @@ 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) ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (test) [127.0.0.1] P=smtp S=sss diff --git a/test/log/0374 b/test/log/0374 index abbd3addf..6b0a9deec 100644 --- a/test/log/0374 +++ b/test/log/0374 @@ -14,8 +14,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=real T=real 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@myhost.test.ex R=ut4 T=ut4 defer (dd): Connection refused -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0375 b/test/log/0375 index 1b42aa622..8a32bda96 100644 --- a/test/log/0375 +++ b/test/log/0375 @@ -12,8 +12,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@myhost.test.ex> P=<> R=real T=real 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 => h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=real T=real 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed diff --git a/test/log/0377 b/test/log/0377 index e708c10f5..9f5942088 100644 --- a/test/log/0377 +++ b/test/log/0377 @@ -5,9 +5,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => aaaa <aaaa@myhost.test.ex> R=seen_aaaa T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 => bbbb <bbbb@myhost.test.ex> R=bbbb_0 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 => cccc <cccc@myhost.test.ex> R=cccc_accept T=t1 -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer_cccc@myhost.test.ex <cccc@myhost.test.ex> R=defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer_cccc@myhost.test.ex <cccc@myhost.test.ex> R=defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0378 b/test/log/0378 index 3747aa385..15b3d6e99 100644 --- a/test/log/0378 +++ b/test/log/0378 @@ -6,6 +6,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3 1999-03-02 09:44:33 10HmaX-0005vi-00 => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2 1999-03-02 09:44:33 10HmaX-0005vi-00 => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1 -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer_aaaa@myhost.test.ex <aaaa@myhost.test.ex> R=defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0379 b/test/log/0379 index be67f6e88..73c1db679 100644 --- a/test/log/0379 +++ b/test/log/0379 @@ -2,6 +2,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@myhost.test.ex R=defer defer (-1): forced defer 1999-03-02 09:44:33 10HmaX-0005vi-00 => bbbb <aaaa@myhost.test.ex> R=bc T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 => cccc <aaaa@myhost.test.ex> R=bc T=t1 -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@myhost.test.ex R=defer defer (-1): forced defer -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0382 b/test/log/0382 index 46f02df2d..10575f8df 100644 --- a/test/log/0382 +++ b/test/log/0382 @@ -4,7 +4,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@test.ex: Unrouteable address 1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message) 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 cancelled by timeout_frozen_after 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf diff --git a/test/log/0420 b/test/log/0420 index ae4dfda31..6bf86d64d 100644 --- a/test/log/0420 +++ b/test/log/0420 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 "h: <>" 1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(client.test.ex) [127.0.0.1] P=smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 "h: <some text;\n Tue, 2 Mar 1999 09:44:33 +0000>" diff --git a/test/log/0429 b/test/log/0429 index d477a6b9b..168bf1274 100644 --- a/test/log/0429 +++ b/test/log/0429 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO myhost.test.ex: 550 No 1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO myhost.test.ex: 550 No 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0433 b/test/log/0433 index 1dce1349d..3b25ebb54 100644 --- a/test/log/0433 +++ b/test/log/0433 @@ -1,8 +1,8 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_D2 -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:PORT_D4 port PORT_D (IPv4) port PORT_D2 (IPv4) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_D2 [127.0.0.1]:PORT_D4 -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:PORT_D4 port PORT_D3 (IPv4) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_D2 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D port PORT_D2 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on [127.0.0.1]:PORT_D4 port PORT_D (IPv4) port PORT_D2 (IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D port PORT_D2 [127.0.0.1]:PORT_D4 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on [127.0.0.1]:PORT_D4 port PORT_D3 (IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D port PORT_D2 diff --git a/test/log/0437 b/test/log/0437 index 91aa249fc..4bf34e808 100644 --- a/test/log/0437 +++ b/test/log/0437 @@ -1,8 +1,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@myhost.test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@myhost.test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0438 b/test/log/0438 index 78796810d..a22c30dc1 100644 --- a/test/log/0438 +++ b/test/log/0438 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0439 b/test/log/0439 index b9327d740..f4bd1a6bd 100644 --- a/test/log/0439 +++ b/test/log/0439 @@ -2,5 +2,5 @@ 1999-03-02 09:44:33 invalid message_size_limit: absolute value of integer "8796093022208M" is too large (overflow) ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 invalid message_size_limit: absolute value of integer "8796093022208M" is too large (overflow) diff --git a/test/log/0440 b/test/log/0440 index 1c9077873..a48d97791 100644 --- a/test/log/0440 +++ b/test/log/0440 @@ -4,11 +4,11 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == x2@y2 R=r1 T=t1 defer (0): SMTP delivery explicitly queued 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 == x3@y3 R=r1 T=t1 defer (0): SMTP delivery explicitly queued -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => x1@y1 R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x3@y3 R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => x2@y2 R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0447 b/test/log/0447 index 5069ceb53..af9aff488 100644 --- a/test/log/0447 +++ b/test/log/0447 @@ -1,13 +1,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection timed out 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Connection timed out -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection timed out 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Connection timed out -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection timed out 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Connection timed out -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@xx.test.again.dns R=r0 defer (-1): host lookup did not complete diff --git a/test/log/0450 b/test/log/0450 index e5df92aad..b311bd657 100644 --- a/test/log/0450 +++ b/test/log/0450 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Connection refused -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Connection refused -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0454 b/test/log/0454 index ad391698f..98a0a4cf9 100644 --- a/test/log/0454 +++ b/test/log/0454 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => xx <userx@test.ex> R=r2 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/0455 b/test/log/0455 index a755cfad2..bedf22f65 100644 --- a/test/log/0455 +++ b/test/log/0455 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error @@ -11,4 +11,4 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0458 b/test/log/0458 index 5e7f2dedf..1c70d5405 100644 --- a/test/log/0458 +++ b/test/log/0458 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1111 I=[127.0.0.1]:PORT_D F=<userx@test.ex> rejected RCPT <userx@test.ex> 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:PORT_D F=<userx@test.ex> rejected RCPT <userx@test.ex> 1999-03-02 09:44:33 SMTP protocol error in "DATA" H=(rhu.barb) [127.0.0.1]:1112 I=[127.0.0.1]:PORT_D valid RCPT command must precede DATA diff --git a/test/log/0460 b/test/log/0460 index 06a6ffafa..ffc087681 100644 --- a/test/log/0460 +++ b/test/log/0460 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss diff --git a/test/log/0461 b/test/log/0461 index 840265f82..c2414ac88 100644 --- a/test/log/0461 +++ b/test/log/0461 @@ -19,7 +19,7 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error 1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Network Error -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error 1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Network Error 1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@test.ex: retry timeout exceeded @@ -27,7 +27,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 => CALLER <CALLER@test.ex> R=r0 T=t2 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 ** userx@test.ex R=r1 T=t1: all hosts for 'test.ex' have been failing for a long time (and retry time not reached) 1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss diff --git a/test/log/0474 b/test/log/0474 index db36867a7..723dbec91 100644 --- a/test/log/0474 +++ b/test/log/0474 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE 1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 850 RUBBISH 1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 850 RUBBISH -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<abcd@xyz>: 850 RUBBISH -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0476 b/test/log/0476 index 41cf8980c..19a942fc9 100644 --- a/test/log/0476 +++ b/test/log/0476 @@ -2,11 +2,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (0): SMTP delivery explicitly queued 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=r1 T=t1 defer (0): SMTP delivery explicitly queued -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 550 NO 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex' -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0478 b/test/log/0478 index 68ecace4c..ca3aafe5c 100644 --- a/test/log/0478 +++ b/test/log/0478 @@ -4,11 +4,11 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q1h, listening for SMTP on port PORT_D -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, -q1h, listening for SMTP on port PORT_D +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == V4NET.0.0.1@test.ex R=r1 T=t1 defer (dd): Network Error -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error 1999-03-02 09:44:33 10HmaZ-0005vi-00 == 127.0.0.1@test.ex R=r1 T=t1 defer (dd): Network Error diff --git a/test/log/0480 b/test/log/0480 index 6c1ddfcea..4265dcecb 100644 --- a/test/log/0480 +++ b/test/log/0480 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=(foobar) [127.0.0.1] P=smtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/0482 b/test/log/0482 index 617fd5c2b..b97ca157e 100644 --- a/test/log/0482 +++ b/test/log/0482 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx diff --git a/test/log/0498 b/test/log/0498 index c1bd86094..215ea501d 100644 --- a/test/log/0498 +++ b/test/log/0498 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 DELAY 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y R=r1 T=t1 defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 DELAY -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after end of data (ddd bytes written): Connection timed out 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after end of data (ddd bytes written) 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@x.y: retry timeout exceeded @@ -9,4 +9,4 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@myhost.test.ex> R=r0 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0502 b/test/log/0502 index 6ad0684f4..6a8cdac00 100644 --- a/test/log/0502 +++ b/test/log/0502 @@ -15,7 +15,7 @@ 1999-03-02 09:44:33 Accepted: ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Messages received: 1999-03-02 09:44:33 Messages accepted: 1999-03-02 09:44:33 Recipients: diff --git a/test/log/0512 b/test/log/0512 index 206a2e96a..1ad7291f9 100644 --- a/test/log/0512 +++ b/test/log/0512 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused @@ -12,11 +12,11 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@myhost.test.ex> R=r0 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused @@ -25,4 +25,4 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@myhost.test.ex> R=r0 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0514 b/test/log/0514 index 10d3329b7..fed89b8f5 100644 --- a/test/log/0514 +++ b/test/log/0514 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= "spaced user"@myhost.test.ex U=spaced user P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@myhost.test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0516 b/test/log/0516 index df1c91b9d..599e48578 100644 --- a/test/log/0516 +++ b/test/log/0516 @@ -5,14 +5,14 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == deferfirsttime@myhost.test.ex <toplevel@myhost.test.ex> R=r3 defer (-1): Defer the first time 1999-03-02 09:44:33 10HmaX-0005vi-00 => second <toplevel@myhost.test.ex> R=r4 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 -> third <toplevel@myhost.test.ex> R=r4 T=t1 -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == alwaysdefer@myhost.test.ex <toplevel@myhost.test.ex> R=r0 defer (-1): Always 1999-03-02 09:44:33 10HmaX-0005vi-00 == alwaysdefer@myhost.test.ex <toplevel@myhost.test.ex> R=r0 defer (-1): Always 1999-03-02 09:44:33 10HmaX-0005vi-00 == alwaysdefer@myhost.test.ex <toplevel@myhost.test.ex> R=r0 defer (-1): Always 1999-03-02 09:44:33 10HmaX-0005vi-00 => deferfirsttime <toplevel@myhost.test.ex> R=r4 T=t1 -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == alwaysdefer@myhost.test.ex <toplevel@myhost.test.ex> R=r0 defer (-1): Always 1999-03-02 09:44:33 10HmaX-0005vi-00 == alwaysdefer@myhost.test.ex <toplevel@myhost.test.ex> R=r0 defer (-1): Always 1999-03-02 09:44:33 10HmaX-0005vi-00 == alwaysdefer@myhost.test.ex <toplevel@myhost.test.ex> R=r0 defer (-1): Always -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf diff --git a/test/log/0529 b/test/log/0529 index 1d46bf8ef..afd34d23b 100644 --- a/test/log/0529 +++ b/test/log/0529 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox) -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-53): Retry time not yet reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0531 b/test/log/0531 index 89be9cb37..8b15e1002 100644 --- a/test/log/0531 +++ b/test/log/0531 @@ -8,14 +8,14 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@retry.test.ex R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 450 TEMPERROR -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@retry.test.ex R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 450 TEMPERROR 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@retry.test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@myhost.test.ex> F=<> R=bounces T=t1 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@test.ex R=smartuser T=lmtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 450 TEMPERROR 1999-03-02 09:44:33 10HmbB-0005vi-00 ** userx@test.ex: retry timeout exceeded diff --git a/test/log/0543 b/test/log/0543 index 7d33956cb..5c5b17601 100644 --- a/test/log/0543 +++ b/test/log/0543 @@ -2,8 +2,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 R=smarthost T=smtp defer (-44) H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0547 b/test/log/0547 index 4756cf284..449ee4031 100644 --- a/test/log/0547 +++ b/test/log/0547 @@ -2,9 +2,9 @@ 1999-03-02 09:44:33 no MAIL in SMTP connection from CALLER D=qqs C=EXPN,QUIT ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 no MAIL in SMTP connection from [127.0.0.1] D=q.qqqs -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=qqs C=QUIT 1999-03-02 09:44:33 H=(x.y.z) [127.0.0.1] rejected VRFY a@b.c 1999-03-02 09:44:33 no MAIL in SMTP connection from (x.y.z) [127.0.0.1] D=qqs C=EHLO,VRFY,QUIT diff --git a/test/log/0548 b/test/log/0548 index 52315d431..17a4ddf94 100644 --- a/test/log/0548 +++ b/test/log/0548 @@ -2,29 +2,29 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Recipient deferred 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (-44) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Recipient deferred -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred 1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Recipient deferred 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (-44) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Recipient deferred -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: Recipient deferred 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL: host deferred 1999-03-02 09:44:33 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> temporarily rejected RCPT <userx@test.ex>: Recipient deferred diff --git a/test/log/0549 b/test/log/0549 index 6161c31ba..61b05e67f 100644 --- a/test/log/0549 +++ b/test/log/0549 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0552 b/test/log/0552 index 1d85d61ad..b08d4ecb9 100644 --- a/test/log/0552 +++ b/test/log/0552 @@ -1,20 +1,20 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Accept non-SMTP 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss: Connection timed out 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx2@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx3@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1] lost while reading message data (header) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/0553 b/test/log/0553 index 30176d891..ffedd8a91 100644 --- a/test/log/0553 +++ b/test/log/0553 @@ -1,18 +1,18 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=t1 T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after RCPT TO:<userx1@test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout after RCPT TO:<userx1@test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout after RCPT TO:<userx1@test.ex> -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=t1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx2@test.ex R=t1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> userx3@test.ex R=t1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1] lost while reading message data (header) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/0556 b/test/log/0556 index 7f8c3538b..afffb9096 100644 --- a/test/log/0556 +++ b/test/log/0556 @@ -1,7 +1,7 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="Start: sent early ...\r\n" -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<userx@test.ex>" H=(abcd) [127.0.0.1] next input="rcpt to:<userx@test.ex>\r\n" 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "rcpt to:<userx@test.ex>" H=(abcd) [127.0.0.1] next input="data\r\n" diff --git a/test/log/0559 b/test/log/0559 index b0f13b47f..b9639a9a0 100644 --- a/test/log/0559 +++ b/test/log/0559 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(abcd) [127.0.0.1] P=esmtp diff --git a/test/log/0561 b/test/log/0561 index a8f6a2f78..35a6dbe35 100644 --- a/test/log/0561 +++ b/test/log/0561 @@ -2,30 +2,30 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: load average 0.01 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: load average 0.01 -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq +1999-03-02 09:44:33 Start queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: load average 0.01 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 no immediate delivery: load average 0.02 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: load average 0.01 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: load average 0.01 -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: load average 0.01 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex diff --git a/test/log/0562 b/test/log/0562 index 5bb96792c..f7a8b017c 100644 --- a/test/log/0562 +++ b/test/log/0562 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from (abcd) [127.0.0.1] F=<userx@test.ex> 1999-03-02 09:44:33 NOTQUIT reason: 'data-timeout' 1999-03-02 09:44:33 SMTP command timeout on connection from [127.0.0.1] diff --git a/test/log/0564 b/test/log/0564 index dbaac4b92..9b870da65 100644 --- a/test/log/0564 +++ b/test/log/0564 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, launched with listening socket, with no wait timeout +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, launched with listening socket, with no wait timeout 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(abcd) [127.0.0.1] P=esmtp S=sss diff --git a/test/log/0570 b/test/log/0570 index 5cc32a94e..2f3801a12 100644 --- a/test/log/0570 +++ b/test/log/0570 @@ -1,61 +1,61 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domd.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 == usery@domf.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@dome.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domf.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@domg.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 -> usery@domh.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbG-0005vi-00 == usery@doml.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbG-0005vi-00 => userx@domk.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00" -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1239 +1999-03-02 09:44:33 Start queue run: pid=p1240 -qf 1999-03-02 09:44:33 10HmbG-0005vi-00 => usery@doml.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1240 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1241 1999-03-02 09:44:33 10HmbJ-0005vi-00 == usery@domn.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@domm.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-0005vi-00" -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1241 +1999-03-02 09:44:33 Start queue run: pid=p1242 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 => usery@domn.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1242 -qf 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1243 1999-03-02 09:44:33 10HmbM-0005vi-00 == userz@domq.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbM-0005vi-00 => userx@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" 1999-03-02 09:44:33 10HmbM-0005vi-00 -> usery@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1243 +1999-03-02 09:44:33 Start queue run: pid=p1244 -qf 1999-03-02 09:44:33 10HmbM-0005vi-00 => userz@domq.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbO-0005vi-00" 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1244 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1245, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex diff --git a/test/log/0576 b/test/log/0576 index ddc28f932..c9f31bf2c 100644 --- a/test/log/0576 +++ b/test/log/0576 @@ -2,24 +2,24 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex 1999-03-02 09:44:33 using queue 'alternate' 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => normal <normal@test.ex> F=<CALLER@the.local.host.name> R=all T=dump 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq -1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp -1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp -1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 -qq +1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=p1235 +1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=p1235 +1999-03-02 09:44:33 Start 'alternate' queue run: pid=p1236 1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate <alternate@test.ex> F=<CALLER@the.local.host.name> Q=alternate R=all T=dump 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp +1999-03-02 09:44:33 End 'alternate' queue run: pid=p1236 1999-03-02 09:44:33 using queue 'lowpri' 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=lowpri for lowpri@test.ex 1999-03-02 09:44:33 using queue 'alternate' 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 => alternate <alternate@test.ex> F=<CALLER@the.local.host.name> R=all T=dump 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 using queue '' 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex 1999-03-02 09:44:33 using queue 'alternate' @@ -33,10 +33,10 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -qGlowpri/3s, not listening for SMTP -1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp -1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp -1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, -qGlowpri/3s, not listening for SMTP +1999-03-02 09:44:33 Start 'lowpri' queue run: pid=p1239 +1999-03-02 09:44:33 End 'lowpri' queue run: pid=p1239 +1999-03-02 09:44:33 Start 'lowpri' queue run: pid=p1240 1999-03-02 09:44:33 10HmaZ-0005vi-00 => lowpri <lowpri@test.ex> F=<CALLER@the.local.host.name> Q=lowpri R=all T=dump 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp +1999-03-02 09:44:33 End 'lowpri' queue run: pid=p1240 diff --git a/test/log/0579 b/test/log/0579 index ba02bf4b5..3eba2e512 100644 --- a/test/log/0579 +++ b/test/log/0579 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 cmd 'RCPT TO:<"name with spaces"@test.ex>' 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=(test) [127.0.0.1] P=esmtp S=sss for "name with spaces"@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <"name with spaces"@test.ex> R=r1 diff --git a/test/log/0581 b/test/log/0581 index 2a82ace48..7762a17a3 100644 --- a/test/log/0581 +++ b/test/log/0581 @@ -4,15 +4,15 @@ 1999-03-02 09:44:33 test5 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userc@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userd@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userd@test.ex R=r_remote T=t1 H=127.0.0.1 [127.0.0.1] C="250 yeah got that message" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => userf@test.ex R=r_remote T=t1 H=127.0.0.1 [127.0.0.1] C="250 yeah got that message" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userc@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userd@test.ex userd2@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userd@test.ex R=r_remote T=t1 H=127.0.0.1 [127.0.0.1] C="250 yeah got that message" 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> userd2@test.ex R=r_remote T=t1 H=127.0.0.1 [127.0.0.1] C="250 yeah got that message" diff --git a/test/log/0583 b/test/log/0583 index dcbd6565a..aff778595 100644 --- a/test/log/0583 +++ b/test/log/0583 @@ -1,6 +1,6 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 router was called for quota_good@test.ex 2017-07-30 18:51:05.712 transport was called for quota_good@test.ex 2017-07-30 18:51:05.712 router was called for quota_fail@test.ex diff --git a/test/log/0586 b/test/log/0586 index 3b4dcebb9..f12842fc5 100644 --- a/test/log/0586 +++ b/test/log/0586 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 helo localhost dnssec <no> 1999-03-02 09:44:33 helo l-sec dnssec <yes> diff --git a/test/log/0589 b/test/log/0589 index 944645114..262be36ea 100644 --- a/test/log/0589 +++ b/test/log/0589 @@ -1,6 +1,6 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtp S=sss for good@test.ex 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtp S=sss for bad@test.ex 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@test.ex H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss for good@test.ex diff --git a/test/log/0597 b/test/log/0597 index cef4d7471..0235a835a 100644 --- a/test/log/0597 +++ b/test/log/0597 @@ -1,26 +1,26 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => queue_only_1@test.ex R=outbound T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => queue_only_2@test.ex R=outbound T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <queue_only_1@test.ex> R=discard_remote_source 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <queue_only_2@test.ex> R=discard_remote_source 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => first_pass_route_1@test.ex R=outbound T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 => first_pass_route_2@test.ex R=outbound T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]* C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 +1999-03-02 09:44:33 Start queue run: pid=p1237 +1999-03-02 09:44:33 End queue run: pid=p1237 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=(me) [127.0.0.1] P=smtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=(me) [127.0.0.1] P=smtp S=sss diff --git a/test/log/0598 b/test/log/0598 index 9f7acbfd2..54ed1ab98 100644 --- a/test/log/0598 +++ b/test/log/0598 @@ -8,4 +8,4 @@ 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0600 b/test/log/0600 index 36ab9e005..a1a1aa883 100644 --- a/test/log/0600 +++ b/test/log/0600 @@ -16,5 +16,5 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@the.local.host.name> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/log/0605 b/test/log/0605 index 2de55555d..6144d88d2 100644 --- a/test/log/0605 +++ b/test/log/0605 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] (TCP/IP connection count = 1) 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] closed by QUIT diff --git a/test/log/0607 b/test/log/0607 index 4d4a4b7c5..3064616bc 100644 --- a/test/log/0607 +++ b/test/log/0607 @@ -1,14 +1,14 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for testx@cname46.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for testx@cname4.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => testx@cname46.test.ex F=<CALLER@the.local.host.name> R=all T=out H=localhost.test.ex [::1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => testx@cname4.test.ex F=<CALLER@the.local.host.name> R=all T=out H=thishost.test.ex [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) 1999-03-02 09:44:33 no host name found for IP address ::1 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name H=(the.local.host.name) [::1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for testx@cname46.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name for testx@cname4.test.ex diff --git a/test/log/0609 b/test/log/0609 index 10e8e5959..37a45878a 100644 --- a/test/log/0609 +++ b/test/log/0609 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) 1999-03-02 09:44:33 SMTP connection from (test) [127.0.0.1] closed by QUIT 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) diff --git a/test/log/0610 b/test/log/0610 index 63303e891..bb5c8014a 100644 --- a/test/log/0610 +++ b/test/log/0610 @@ -1,22 +1,22 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= t1@dustyshoes.tld U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= t2@dustybelt.tld U=CALLER P=local-smtp S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later 1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@anotherone.tld R=r1 T=t1 defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later 1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later 1999-03-02 09:44:33 10HmaY-0005vi-00 == fred@anotherone.tld R=r2 T=t2 defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later -1999-03-02 09:44:33 End queue run: pid=pppp -qq -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq +1999-03-02 09:44:33 Start queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => fred@anotherone.tld F=<t1@dustyshoes.tld> R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => fred@anotherone.tld F=<t2@dustybelt.tld> R=r2 T=t2 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1235 -qq ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=[127.0.0.1] temporarily rejected connection in "connect" ACL 1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] temporarily rejected connection in "connect" ACL -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= t1@dustyshoes.tld H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name 1999-03-02 09:44:33 10HmbA-0005vi-00 <= t2@dustybelt.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name diff --git a/test/log/0611 b/test/log/0611 index 003e7c045..332efc1e8 100644 --- a/test/log/0611 +++ b/test/log/0611 @@ -1,19 +1,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for a b c -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 == c@test.ex R=rmt_client T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 => c@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for y 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for z 1999-03-02 09:44:33 10HmbC-0005vi-00 == z@test.ex R=lcl_client T=pipe defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbB-0005vi-00 => y <y@test.ex> R=lcl_client T=pipe 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbC-0005vi-00 => z <z@test.ex> R=lcl_client T=pipe 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 diff --git a/test/log/0612 b/test/log/0612 index 0c818aed2..f3d3cb3ad 100644 --- a/test/log/0612 +++ b/test/log/0612 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 rej/never -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect 1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:ehlo @@ -9,9 +9,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 rmt_reject@test.ex: error ignored: RFC 3461 DSN, failure notify not requested 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 accept/success -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:connect 1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:ehlo @@ -20,21 +20,21 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:complete -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaZ-0005vi-00 => rmt_accept <rmt_accept@test.ex> R=r1 T=tofile 1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss for b@dump.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:complete -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <b@dump.ex> R=r_dump 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 event msg:complete -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 defer/delay -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:connect 1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:ehlo @@ -42,9 +42,9 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:defer 1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:close 1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@test.ex>: 451 Temporary local problem - please try later -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 defer/never -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect @@ -53,13 +53,13 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:defer 1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:close 1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@test.ex R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@test.ex>: 451 Temporary local problem - please try later -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 1999-03-02 09:44:33 playout -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for c@dump.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@test.ex routing defer (-52): retry time not reached -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1240 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:fail:internal 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbB-0005vi-00 removed by CALLER @@ -69,7 +69,7 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 rej/failure+delay -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1241 1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <c@dump.ex> R=r_dump 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:complete @@ -81,17 +81,17 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss for e@dump.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:complete -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1241 1999-03-02 09:44:33 deliver DSN -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1242 1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <e@dump.ex> R=r_dump 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed 1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:complete -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1242 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1243, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1244, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@dump.ex H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_reject@test.ex 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<a@dump.ex> rejected RCPT <rmt_reject@test.ex> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= b@dump.ex H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_accept@test.ex diff --git a/test/log/0614 b/test/log/0614 index d7edb1872..4bfb0397f 100644 --- a/test/log/0614 +++ b/test/log/0614 @@ -4,7 +4,7 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 <= peter@dustybelt.tld U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbC-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbE-0005vi-00" @@ -17,10 +17,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => bob@anotherone.tld F=<peter@dustybelt.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbD-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name 1999-03-02 09:44:33 10HmbE-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@the.local.host.name 1999-03-02 09:44:33 10HmbF-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name diff --git a/test/log/0615 b/test/log/0615 index abef7e729..0bab50781 100644 --- a/test/log/0615 +++ b/test/log/0615 @@ -79,7 +79,7 @@ 2017-07-30 18:51:05.712 10HmdX-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss 2017-07-30 18:51:05.712 10HmdY-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss 2017-07-30 18:51:05.712 10HmdZ-0005vi-00 <= ralph@dustyshoes.tld U=CALLER P=local-smtp S=sss -2017-07-30 18:51:05.712 Start queue run: pid=pppp -qq +2017-07-30 18:51:05.712 Start queue run: pid=p1234 -qq 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmeA-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmdZ-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeB-0005vi-00" @@ -242,10 +242,10 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => bob@anotherone.tld F=<ralph@dustyshoes.tld> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhC-0005vi-00" 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -qq +2017-07-30 18:51:05.712 End queue run: pid=p1234 -qq ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmeA-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name 2017-07-30 18:51:05.712 10HmeB-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdZ-0005vi-00@the.local.host.name 2017-07-30 18:51:05.712 10HmeC-0005vi-00 <= ralph@dustyshoes.tld H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdY-0005vi-00@the.local.host.name diff --git a/test/log/0616 b/test/log/0616 index e64ccde6e..2ff77f63a 100644 --- a/test/log/0616 +++ b/test/log/0616 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=route_smtp T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 ** usery@domain1 <userx@domain1> R=route_smtp T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 550 Not that one 1999-03-02 09:44:33 10HmaX-0005vi-00 usery@domain1 <userx@domain1>: error ignored 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf diff --git a/test/log/0617 b/test/log/0617 index 865db794e..cbc6d4dbb 100644 --- a/test/log/0617 +++ b/test/log/0617 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=route_smtp T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 ** usery@domain1 <userx@domain1> R=route_smtp T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 550 Not that one 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <dump@domain1> R=dump_bounces 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf diff --git a/test/log/0618 b/test/log/0618 index c84f87428..5e964b579 100644 --- a/test/log/0618 +++ b/test/log/0618 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@test.ex H=(tester) [127.0.0.1] P=smtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@test.ex H=(tester) [127.0.0.1] P=smtp S=sss diff --git a/test/log/0621 b/test/log/0621 index c2331dfb2..b3176a10d 100644 --- a/test/log/0621 +++ b/test/log/0621 @@ -1,5 +1,5 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -2017-07-30 18:51:05.712 pid pppp: SIGHUP received: re-exec daemon -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 pid p1234: SIGHUP received: re-exec daemon +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0622 b/test/log/0622 index d433cbd0a..62444780e 100644 --- a/test/log/0622 +++ b/test/log/0622 @@ -23,7 +23,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> temporarily rejected RCPT <B@test.ex>: 452 4.5.3 Try again 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> temporarily rejected RCPT <C@test.ex>: 452 4.5.3 Try again diff --git a/test/log/0624 b/test/log/0624 index f70aaa97b..9a7ae6ab3 100644 --- a/test/log/0624 +++ b/test/log/0624 @@ -5,7 +5,7 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_D2 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D port PORT_D2 2017-07-30 18:51:05.712 localhost 2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F=<CALLER@test.ex> RCPT <a@test.ex>: discarded by RCPT ACL 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name diff --git a/test/log/0625 b/test/log/0625 index 41dcfb4fd..d37ce99be 100644 --- a/test/log/0625 +++ b/test/log/0625 @@ -5,7 +5,7 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F=<CALLER@test.ex> RCPT <a@test.ex>: discarded by RCPT ACL 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients) diff --git a/test/log/0628 b/test/log/0628 index 9cff3eeef..2c9186f2b 100644 --- a/test/log/0628 +++ b/test/log/0628 @@ -1,13 +1,13 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <dest@test.ex> R=r1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= tester2@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <dest2@test.ex> R=r1 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 diff --git a/test/log/0629 b/test/log/0629 index 6161c31ba..61b05e67f 100644 --- a/test/log/0629 +++ b/test/log/0629 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/0630 b/test/log/0630 index 82a6c823b..76088f529 100644 --- a/test/log/0630 +++ b/test/log/0630 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= test_3@paniclogrouter H=(test.ex) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Tainted filename '/dest3' 1999-03-02 09:44:33 10HmaX-0005vi-00 failed to open /dest3 when checking "/$local_part": Permission denied (euid=uuuu egid=EXIM_GID) diff --git a/test/log/0631 b/test/log/0631 index d7e5e70fc..886afe082 100644 --- a/test/log/0631 +++ b/test/log/0631 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= test_3@paniclogrouter H=(test.ex) [127.0.0.1] P=esmtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <dest3@test.ex> R=r0 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/0900 b/test/log/0900 index f91741a43..c7dc54799 100644 --- a/test/log/0900 +++ b/test/log/0900 @@ -1,6 +1,6 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= someone@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex diff --git a/test/log/0901 b/test/log/0901 index e4bb6a243..3c66c0894 100644 --- a/test/log/0901 +++ b/test/log/0901 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone1@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone2@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone3@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex diff --git a/test/log/0906 b/test/log/0906 index df3889b1c..6a8a1be47 100644 --- a/test/log/0906 +++ b/test/log/0906 @@ -1,10 +1,10 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => a <a@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D port PORT_S 1999-03-02 09:44:33 10HmaY-0005vi-00 <= sender@dom H=(test.com) [127.0.0.1] P=esmtp K S=sss for a@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss for a@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL diff --git a/test/log/1001 b/test/log/1001 index 622e60f87..17dfdd97a 100644 --- a/test/log/1001 +++ b/test/log/1001 @@ -1,14 +1,14 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=([ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=([IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=([IPV6:V6NET:0:12:1:a00:20ff:fe86:a062]) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss diff --git a/test/log/1003 b/test/log/1003 index 4dc4d637c..23440d378 100644 --- a/test/log/1003 +++ b/test/log/1003 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => user4@h1.test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => user6@h3.test.ex R=client T=send_to_server3 H=::1 [::1] C="250 OK id=10HmbC-0005vi-00" @@ -10,10 +10,10 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => user6@h4.test.ex R=client T=send_to_server4 H=::1 [::1] C="250 OK id=10HmbD-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 == user6@h5.test.ex R=client T=send_to_server5 defer (-1): failed to expand "interface" option for send_to_server5 transport: condition name expected, but found "" -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 no host name found for IP address ::1 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [::1] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex diff --git a/test/log/1006 b/test/log/1006 index dace86143..2439099b5 100644 --- a/test/log/1006 +++ b/test/log/1006 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv4) diff --git a/test/log/1007 b/test/log/1007 index 74409a96d..0ead6ca41 100644 --- a/test/log/1007 +++ b/test/log/1007 @@ -1,10 +1,10 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D3 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D3 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (IPv4) diff --git a/test/log/1023 b/test/log/1023 index d946d9c74..eb33beb6d 100644 --- a/test/log/1023 +++ b/test/log/1023 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => user6@h2.test.ex R=client T=send_to_server2 H=::1 [::1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/1090 b/test/log/1090 index 3d12e35e2..cadf41ee4 100644 --- a/test/log/1090 +++ b/test/log/1090 @@ -6,7 +6,7 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed diff --git a/test/log/1101 b/test/log/1101 index d239d2cfd..76c80b307 100644 --- a/test/log/1101 +++ b/test/log/1101 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D port PORT_S diff --git a/test/log/1102 b/test/log/1102 index 2330c3a98..9bbca1052 100644 --- a/test/log/1102 +++ b/test/log/1102 @@ -1,5 +1,5 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 server cert: CN=Phil Pennock 2017-07-30 18:51:05.712 server cert: CN=server1.example.com diff --git a/test/log/1103 b/test/log/1103 index 8c21fd63d..6ca8c0f17 100644 --- a/test/log/1103 +++ b/test/log/1103 @@ -1,9 +1,9 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=(test) [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss diff --git a/test/log/1104 b/test/log/1104 index c32814637..53cea6aed 100644 --- a/test/log/1104 +++ b/test/log/1104 @@ -1,9 +1,9 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: encryption required 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtp S=sss diff --git a/test/log/1105 b/test/log/1105 index 3e13156f3..0fdaa0280 100644 --- a/test/log/1105 +++ b/test/log/1105 @@ -1,6 +1,6 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required diff --git a/test/log/1106 b/test/log/1106 index ccbc80fcb..dbdfb76f1 100644 --- a/test/log/1106 +++ b/test/log/1106 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP command timeout on TLS connection from [127.0.0.1] diff --git a/test/log/1107 b/test/log/1107 index 56ccf3579..bf245861c 100644 --- a/test/log/1107 +++ b/test/log/1107 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) 1999-03-02 09:44:33 TLS error on connection from (timeout.rhu.barb) [127.0.0.1] (tls lib accept fn): timed out 1999-03-02 09:44:33 SMTP command timeout on connection from (timeout.rhu.barb) [127.0.0.1] diff --git a/test/log/1108 b/test/log/1108 index 5f19de341..c8f48de2e 100644 --- a/test/log/1108 +++ b/test/log/1108 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt" diff --git a/test/log/1110 b/test/log/1110 index 450b9b46f..a2d8e1795 100644 --- a/test/log/1110 +++ b/test/log/1110 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss diff --git a/test/log/1111 b/test/log/1111 index 6161c31ba..61b05e67f 100644 --- a/test/log/1111 +++ b/test/log/1111 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/1112 b/test/log/1112 index e6311910e..2dab92e7e 100644 --- a/test/log/1112 +++ b/test/log/1112 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D and for SMTPS on port PORT_D2 port PORT_D3 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D and for SMTPS on port PORT_D2 port PORT_D3 diff --git a/test/log/1113 b/test/log/1113 index a23e6ce57..facaa816e 100644 --- a/test/log/1113 +++ b/test/log/1113 @@ -3,7 +3,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SNI <fred> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=fred S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=server diff --git a/test/log/1114 b/test/log/1114 index 649e2e9cf..4be0bf846 100644 --- a/test/log/1114 +++ b/test/log/1114 @@ -1,5 +1,5 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss for CALLER@test.ex 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss for CALLER@test.ex diff --git a/test/log/1149 b/test/log/1149 index c0f8a663a..bc6ac7f77 100644 --- a/test/log/1149 +++ b/test/log/1149 @@ -1,3 +1,3 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTPS on port PORT_D diff --git a/test/log/1150 b/test/log/1150 index 00415d39a..ca5a528cf 100644 --- a/test/log/1150 +++ b/test/log/1150 @@ -1,20 +1,20 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=server T=local_delivery @@ -22,4 +22,4 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbB-0005vi-00 => abcd <abcd@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/1151 b/test/log/1151 index 28d97d389..6488a2be6 100644 --- a/test/log/1151 +++ b/test/log/1151 @@ -1,9 +1,9 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, -q7s, listening for SMTP on port PORT_D -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, -q7s, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 Start queue run: pid=p1235 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss id=E10HmaX-0005vi-00@myhost.test.ex 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => test@example.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1235 diff --git a/test/log/1152 b/test/log/1152 index ae8d0d11e..4e3e095e7 100644 --- a/test/log/1152 +++ b/test/log/1152 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/1153 b/test/log/1153 index 1e0ec19d6..f6d3efe77 100644 --- a/test/log/1153 +++ b/test/log/1153 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 550 encryption required 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> rejected RCPT <userx@test.ex>: encryption required diff --git a/test/log/1157 b/test/log/1157 index 065ea8961..3aa6f7f04 100644 --- a/test/log/1157 +++ b/test/log/1157 @@ -1,67 +1,67 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usera@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userb@test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userc@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for user_p@test.ex 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for user_q@test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for user_r@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qqf 1999-03-02 09:44:33 10HmbJ-0005vi-00 => user_p@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbL-0005vi-00 => user_r@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed 1999-03-02 09:44:33 10HmbK-0005vi-00 => user_q@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1236 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex 1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1238 -qf 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbB-0005vi-00 => userz <userz@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => usery <usery@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1238 -qf +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for usera@test.ex 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for userc@test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for userb@test.ex 1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1240 -qf 1999-03-02 09:44:33 10HmbG-0005vi-00 => usera <usera@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed 1999-03-02 09:44:33 10HmbH-0005vi-00 => userc <userc@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed 1999-03-02 09:44:33 10HmbI-0005vi-00 => userb <userb@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1240 -qf +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex for user_p@test.ex 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for user_r@test.ex diff --git a/test/log/1159 b/test/log/1159 index 94040ba1b..20bf42132 100644 --- a/test/log/1159 +++ b/test/log/1159 @@ -1,19 +1,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/1160 b/test/log/1160 index f4c1efe1a..2708d248b 100644 --- a/test/log/1160 +++ b/test/log/1160 @@ -1,20 +1,20 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -2017-07-30 18:51:05.712 Start queue run: pid=pppp -qf +2017-07-30 18:51:05.712 Start queue run: pid=p1234 -qf 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -qf +2017-07-30 18:51:05.712 End queue run: pid=p1234 -qf ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTPS on port PORT_D 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp -qf +2017-07-30 18:51:05.712 Start queue run: pid=p1236 -qf 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=server T=local_delivery 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=server T=local_delivery @@ -22,4 +22,4 @@ 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmbB-0005vi-00 => abcd <abcd@test.ex> R=server T=local_delivery 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -qf +2017-07-30 18:51:05.712 End queue run: pid=p1236 -qf diff --git a/test/log/1161 b/test/log/1161 index 59e8330bf..165a19040 100644 --- a/test/log/1161 +++ b/test/log/1161 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem 1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed 1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed diff --git a/test/log/1163 b/test/log/1163 index 63f6c3f7a..21f37f951 100644 --- a/test/log/1163 +++ b/test/log/1163 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed @@ -11,10 +11,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx0@test.ex 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 2) @@ -25,7 +25,7 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery0@test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery1@test.ex 1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx0 <userx0@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx1 <userx1@test.ex> R=server T=local_delivery @@ -38,4 +38,4 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed 1999-03-02 09:44:33 10HmbF-0005vi-00 => usery1 <usery1@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/1165 b/test/log/1165 index a8e0b696d..3a6e20695 100644 --- a/test/log/1165 +++ b/test/log/1165 @@ -5,15 +5,15 @@ 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for first-user@test.ex 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for second-user@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp -qq +2017-07-30 18:51:05.712 Start queue run: pid=p1234 -qq 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => first-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbB-0005vi-00" 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => second-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbC-0005vi-00" 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -qq +2017-07-30 18:51:05.712 End queue run: pid=p1234 -qq ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_S 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaZ-0005vi-00@testhost.test.ex for first-user@test.ex 2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbA-0005vi-00@testhost.test.ex for second-user@test.ex diff --git a/test/log/1190 b/test/log/1190 index b86c95ecf..bbef54bd6 100644 --- a/test/log/1190 +++ b/test/log/1190 @@ -19,7 +19,7 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed @@ -31,11 +31,11 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <e@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <f@test.ex> R=server 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbH-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <g@test.ex> R=server 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed diff --git a/test/log/2000 b/test/log/2000 index 18e8c35b1..b5eb37a09 100644 --- a/test/log/2000 +++ b/test/log/2000 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=127.0.0.1 [127.0.0.1] (not in hosts_require_tls) 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2001 b/test/log/2001 index 96c84d3b2..2bc90bf34 100644 --- a/test/log/2001 +++ b/test/log/2001 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@test.ex R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (certificate verification failed): certificate invalid -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@test.ex R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (certificate verification failed): certificate invalid -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad diff --git a/test/log/2002 b/test/log/2002 index 7289b2caa..cf3bcaee3 100644 --- a/test/log/2002 +++ b/test/log/2002 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery @@ -9,10 +9,10 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com> 1999-03-02 09:44:33 Peer did not present a cert 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss @@ -20,7 +20,7 @@ 1999-03-02 09:44:33 Peer did not present a cert 1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate. -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com> 1999-03-02 09:44:33 Peer cert: 1999-03-02 09:44:33 ver 3 diff --git a/test/log/2010 b/test/log/2010 index 2295e6860..6ed99bb1a 100644 --- a/test/log/2010 +++ b/test/log/2010 @@ -1,17 +1,17 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: a TLS session is required, but the server did not offer TLS support 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: a TLS session is required, but the server did not offer TLS support 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]:PORT_D: a TLS session is required, but the server did not offer TLS support 1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2011 b/test/log/2011 index f0fad261d..74fd26c80 100644 --- a/test/log/2011 +++ b/test/log/2011 @@ -1,13 +1,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for fred@test.net -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<fred@test.net>: 451 Temporary local problem - please try later 1999-03-02 09:44:33 10HmaX-0005vi-00 => fred@test.net R=d0 T=gsmtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=the.local.host.name (test.ex) [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<CALLER@test.ex> temporarily rejected RCPT <fred@test.net> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaX-0005vi-00@test.ex for fred@test.net diff --git a/test/log/2012 b/test/log/2012 index 696c07a92..24307ee8c 100644 --- a/test/log/2012 +++ b/test/log/2012 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=client_x T=send_to_server_failcert defer (-37) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: TLS session: (certificate verification failed): certificate invalid 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaX-0005vi-00 userx@test.ex: error ignored @@ -28,10 +28,10 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 => useru@test.ex R=client_u T=send_to_server_req_passchain H=server1.example.com [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbL-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex diff --git a/test/log/2014 b/test/log/2014 index c800ab7bc..28ba217d2 100644 --- a/test/log/2014 +++ b/test/log/2014 @@ -1,10 +1,10 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate. 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn= 1999-03-02 09:44:33 TLS error on connection from (rhu5.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate. 1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn= -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu7.barb) [ip4.ip4.ip4.ip4] (certificate verification failed): certificate revoked 1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=CN=revoked1.example.com diff --git a/test/log/2020 b/test/log/2020 index 1d45378a5..11ced8f96 100644 --- a/test/log/2020 +++ b/test/log/2020 @@ -1,16 +1,16 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@thishost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=Exim Developers,CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=Exim Developers,CN=thishost.test.ex" C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex diff --git a/test/log/2024 b/test/log/2024 index 5222e9b61..ca181d7b3 100644 --- a/test/log/2024 +++ b/test/log/2024 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate. -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu2.barb) [ip4.ip4.ip4.ip4] (cert/key setup: cert=/non/exist key=/non/exist): Error while reading file. diff --git a/test/log/2025 b/test/log/2025 index c934dfd70..e47c13c74 100644 --- a/test/log/2025 +++ b/test/log/2025 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server 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=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (gnutls_handshake): Could not negotiate a supported cipher suite. 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2026 b/test/log/2026 index 3b4823e1f..3fb7ca091 100644 --- a/test/log/2026 +++ b/test/log/2026 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> temporarily rejected RCPT <usery@myhost.test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp K S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL diff --git a/test/log/2027 b/test/log/2027 index 7fb4f3cbc..f91c70855 100644 --- a/test/log/2027 +++ b/test/log/2027 @@ -1,21 +1,21 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (gnutls_handshake): A TLS fatal alert has been received.: delivering unencrypted to H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls) 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate. -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => usery <usery@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/2029 b/test/log/2029 index 8100e40da..77febcad1 100644 --- a/test/log/2029 +++ b/test/log/2029 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection from (test) [127.0.0.1] (recv): The TLS connection was non-properly terminated. 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(test) [127.0.0.1] P=smtps diff --git a/test/log/2031 b/test/log/2031 index 3b8f61de8..2173cd8fd 100644 --- a/test/log/2031 +++ b/test/log/2031 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SNI <fred> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=fred S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=server diff --git a/test/log/2033 b/test/log/2033 index 2bbcd0068..8d4fbe984 100644 --- a/test/log/2033 +++ b/test/log/2033 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls) 1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex R=client_q T=send_to_server_req_fail H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed @@ -13,10 +13,10 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad diff --git a/test/log/2034 b/test/log/2034 index bcc3bb493..823794141 100644 --- a/test/log/2034 +++ b/test/log/2034 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [127.0.0.1] (tls lib accept fn): timed out 1999-03-02 09:44:33 SMTP command timeout on connection from (rhu1.barb) [127.0.0.1] 1999-03-02 09:44:33 TLS error on connection from (rhu2.barb) [127.0.0.1] (gnutls_handshake): An unexpected TLS packet was received. diff --git a/test/log/2035 b/test/log/2035 index 1646fda58..92905e9bf 100644 --- a/test/log/2035 +++ b/test/log/2035 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userb@test.ex> R=target 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex diff --git a/test/log/2036 b/test/log/2036 index 14bed38e0..1171dfcda 100644 --- a/test/log/2036 +++ b/test/log/2036 @@ -1,14 +1,14 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userd@test.ex> R=target 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userf@test.ex> R=target 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D port PORT_S 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userc@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userd@test.ex -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D port PORT_S 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex diff --git a/test/log/2037 b/test/log/2037 index abe4b3ebd..1ba86a129 100644 --- a/test/log/2037 +++ b/test/log/2037 @@ -4,6 +4,6 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:PORT_D: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA diff --git a/test/log/2049 b/test/log/2049 index 90674743e..d08da42ee 100644 --- a/test/log/2049 +++ b/test/log/2049 @@ -15,24 +15,24 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => userw <userw@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => userz <userz@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 WARNING: deprecated Diffie-Hellman parameter 'ike24' used 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => usera <usera@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 WARNING: deprecated Diffie-Hellman parameter 'ike22' used 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 => userb <userb@test.ex> R=server T=local_delivery diff --git a/test/log/2090 b/test/log/2090 index 79d66d25b..665316622 100644 --- a/test/log/2090 +++ b/test/log/2090 @@ -11,13 +11,13 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 == server_require_bad@test.ex R=client T=send_to_server defer (-37) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: TLS session: error on first read ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <client_require@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: No supported application protocol could be negotiated -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbA-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <server_require_good@test.ex> R=server 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed diff --git a/test/log/2100 b/test/log/2100 index 89feb8e42..d0ea70d86 100644 --- a/test/log/2100 +++ b/test/log/2100 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2101 b/test/log/2101 index 2cd28ac0e..0e5410513 100644 --- a/test/log/2101 +++ b/test/log/2101 @@ -1,14 +1,14 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@test.ex R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@test.ex R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1 index 0863d2536..5d709daa6 100644 --- a/test/log/2102.openssl_1_1_1 +++ b/test/log/2102.openssl_1_1_1 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery @@ -7,10 +7,10 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com> 1999-03-02 09:44:33 Peer did not present a cert 1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss @@ -43,7 +43,7 @@ 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac 1999-03-02 09:44:33 ver: TLS1.x 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com> 1999-03-02 09:44:33 Peer did not present a cert 1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss diff --git a/test/log/2110 b/test/log/2110 index 315dc244a..c3918adff 100644 --- a/test/log/2110 +++ b/test/log/2110 @@ -1,19 +1,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: a TLS session is required, but the server did not offer TLS support 1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: a TLS session is required, but the server did not offer TLS support 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]:PORT_D: a TLS session is required, but the server did not offer TLS support 1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@test.ex: retry timeout exceeded 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2111 b/test/log/2111 index fe68f5af0..62f1caec1 100644 --- a/test/log/2111 +++ b/test/log/2111 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (tls lib accept fn): TCP connection closed by peer 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:AES256-SHA:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2112 b/test/log/2112 index 0813bb65b..3a1508df0 100644 --- a/test/log/2112 +++ b/test/log/2112 @@ -12,7 +12,7 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for user_s@test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usert@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for useru@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=client_x T=send_to_server_failcert defer (-37) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex: retry timeout exceeded @@ -41,10 +41,10 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 => useru@test.ex R=client_u T=send_to_server_req_passchain H=server1.example.com [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbL-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex diff --git a/test/log/2114 b/test/log/2114 index 511cdc966..acb556ecb 100644 --- a/test/log/2114 +++ b/test/log/2114 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn= 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.net @@ -8,7 +8,7 @@ 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.net 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to verify the first certificate cert=/CN=server1.example.net 1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=server1.example.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com diff --git a/test/log/2120 b/test/log/2120 index d4a754d28..5d1e898c1 100644 --- a/test/log/2120 +++ b/test/log/2120 @@ -1,18 +1,18 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@thishost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=Exim Developers/CN=thishost.test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=Exim Developers/CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=Exim Developers/CN=thishost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=Exim Developers/CN=thishost.test.ex" C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex diff --git a/test/log/2124 b/test/log/2124 index 0fa24da3b..5511b9bf8 100644 --- a/test/log/2124 +++ b/test/log/2124 @@ -1,7 +1,7 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_CTX_use_certificate_chain_file file=/non/exist): error:xxxxxxxx:system library:fopen:No such file or directory diff --git a/test/log/2125 b/test/log/2125 index 97ae60d37..d85c53a38 100644 --- a/test/log/2125 +++ b/test/log/2125 @@ -1,10 +1,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:AES128-SHA:128 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:AES128-SHA:128 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2126 b/test/log/2126 index 64f7e54d9..4b4ccbaaf 100644 --- a/test/log/2126 +++ b/test/log/2126 @@ -5,7 +5,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<CALLER@myhost.test.ex> temporarily rejected RCPT <usery@myhost.test.ex> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@myhost.test.ex> R=r0 T=t2 diff --git a/test/log/2127 b/test/log/2127 index 372c93153..3506244c4 100644 --- a/test/log/2127 +++ b/test/log/2127 @@ -1,21 +1,21 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => usery <usery@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/2131 b/test/log/2131 index d607e759b..4bd677d97 100644 --- a/test/log/2131 +++ b/test/log/2131 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SNI <fred> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=fred S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=server diff --git a/test/log/2132 b/test/log/2132 index 605f750f7..5100f5474 100644 --- a/test/log/2132 +++ b/test/log/2132 @@ -1,14 +1,14 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com> 1999-03-02 09:44:33 Peer did not present a cert 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss diff --git a/test/log/2133 b/test/log/2133 index 80c2f75b1..e0f8b4234 100644 --- a/test/log/2133 +++ b/test/log/2133 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex R=client_q T=send_to_server_req_fail H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00" @@ -16,10 +16,10 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/CN=server1.example.com" H="the.local.host.name" 1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>> diff --git a/test/log/2135 b/test/log/2135 index 1646fda58..92905e9bf 100644 --- a/test/log/2135 +++ b/test/log/2135 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userb@test.ex> R=target 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex diff --git a/test/log/2136 b/test/log/2136 index 14bed38e0..1171dfcda 100644 --- a/test/log/2136 +++ b/test/log/2136 @@ -1,14 +1,14 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userd@test.ex> R=target 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userf@test.ex> R=target 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D port PORT_S 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userc@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userd@test.ex -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D port PORT_S 1999-03-02 09:44:33 10HmaY-0005vi-00 <= usere@ok.example H=(test.ex) [127.0.0.1] P=esmtp S=sss for userf@test.ex diff --git a/test/log/2137 b/test/log/2137 index abe4b3ebd..1ba86a129 100644 --- a/test/log/2137 +++ b/test/log/2137 @@ -4,6 +4,6 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:PORT_D: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA diff --git a/test/log/2149 b/test/log/2149 index ea1c7e454..1be072e7e 100644 --- a/test/log/2149 +++ b/test/log/2149 @@ -18,29 +18,29 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => userw <userw@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error (D-H param setting 'TESTSUITE/aux-fixed/dh512'): error:xxxxxxxx:SSL routines::dh key too small 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => usery <usery@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => userz <userz@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 WARNING: deprecated Diffie-Hellman parameter 'ike24' used 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 => usera <usera@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 WARNING: deprecated Diffie-Hellman parameter 'ike22' used 1999-03-02 09:44:33 TLS error (D-H param setting 'ike22'): error:xxxxxxxx:SSL routines::dh key too small 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbH-0005vi-00@myhost.test.ex diff --git a/test/log/2150 b/test/log/2150 index 5bafd09b8..ab77e245e 100644 --- a/test/log/2150 +++ b/test/log/2150 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(test) [127.0.0.1] P=smtps diff --git a/test/log/2152 b/test/log/2152 index 6796211a5..5e48ab8a1 100644 --- a/test/log/2152 +++ b/test/log/2152 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_D2 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D port PORT_D2 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2190 b/test/log/2190 index d77946007..e96e0d494 100644 --- a/test/log/2190 +++ b/test/log/2190 @@ -11,12 +11,12 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 == server_require_bad@test.ex R=client T=send_to_server defer (-18) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Remote host closed connection in response to EHLO myhost.test.ex ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <client_require@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbA-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <server_require_good@test.ex> R=server 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed diff --git a/test/log/2201 b/test/log/2201 index d4f1d7dad..7264583c9 100644 --- a/test/log/2201 +++ b/test/log/2201 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@shorthost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => t@test.ex R=r0 T=remote_delivery H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/3000 b/test/log/3000 index f2a55c5ab..6fd7a3b3e 100644 --- a/test/log/3000 +++ b/test/log/3000 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. diff --git a/test/log/3415 b/test/log/3415 index 162ad4ee9..9c3c9ef0b 100644 --- a/test/log/3415 +++ b/test/log/3415 @@ -1,11 +1,11 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= username@myhost.test.ex H=(rhu.barb) [127.0.0.1] P=esmtpa A=au1:username S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=(rhu.barb) [127.0.0.1] P=esmtpa A=au1:username S=sss -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=(rhu.barb) [127.0.0.1] P=esmtpa A=au1:username S=sss -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=(rhu.barb) [127.0.0.1] P=esmtpa A=au1:username@auth.id.domain S=sss -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> H=(rhu.barb) [127.0.0.1] P=esmtpa A=au1:username@auth.id.domain S=sss diff --git a/test/log/3450 b/test/log/3450 index 5f2fe4239..daf08cb3f 100644 --- a/test/log/3450 +++ b/test/log/3450 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=(foobar) [127.0.0.1] rejected AUTH plain: STARTTLS required before AUTH diff --git a/test/log/3451 b/test/log/3451 index 3a2608863..f567a5738 100644 --- a/test/log/3451 +++ b/test/log/3451 @@ -1,27 +1,27 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server 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" A=plain C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=client T=send_to_server 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" A=plain C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx@test.ex R=client T=send_to_server 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" A=plain C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1235 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1237 -qf diff --git a/test/log/3452 b/test/log/3452 index c03fe6f6f..f104279ab 100644 --- a/test/log/3452 +++ b/test/log/3452 @@ -1,19 +1,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server 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" A=plain C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/3453 b/test/log/3453 index 574cf9bef..52171edbc 100644 --- a/test/log/3453 +++ b/test/log/3453 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/3454 b/test/log/3454 index f14671d0d..c7c0cf715 100644 --- a/test/log/3454 +++ b/test/log/3454 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated. 1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=qqs X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C=EHLO,STARTTLS,AUTH 1999-03-02 09:44:33 no MAIL in SMTP connection from (foobar) [127.0.0.1] D=qqs A=plain:userx X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C=EHLO,STARTTLS,EHLO,AUTH,QUIT diff --git a/test/log/3455 b/test/log/3455 index 6ec76b0ae..e23cd58b9 100644 --- a/test/log/3455 +++ b/test/log/3455 @@ -1,14 +1,14 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=login C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/3460 b/test/log/3460 index 5f2fe4239..daf08cb3f 100644 --- a/test/log/3460 +++ b/test/log/3460 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=(foobar) [127.0.0.1] rejected AUTH plain: STARTTLS required before AUTH diff --git a/test/log/3461 b/test/log/3461 index 1184a96b8..93208d476 100644 --- a/test/log/3461 +++ b/test/log/3461 @@ -1,27 +1,27 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1235 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1237 -qf diff --git a/test/log/3462 b/test/log/3462 index 35fb66c87..d57701f3a 100644 --- a/test/log/3462 +++ b/test/log/3462 @@ -1,19 +1,19 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf diff --git a/test/log/3463 b/test/log/3463 index 574cf9bef..52171edbc 100644 --- a/test/log/3463 +++ b/test/log/3463 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/3464 b/test/log/3464 index f8ab90034..c8e533b1d 100644 --- a/test/log/3464 +++ b/test/log/3464 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=qqs X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C=EHLO,STARTTLS,AUTH 1999-03-02 09:44:33 no MAIL in SMTP connection from (foobar) [127.0.0.1] D=qqs A=plain:userx X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C=EHLO,STARTTLS,EHLO,AUTH,QUIT diff --git a/test/log/3465 b/test/log/3465 index 0caf7ea92..1d7e2c92e 100644 --- a/test/log/3465 +++ b/test/log/3465 @@ -1,14 +1,14 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes A=plain C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=login C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/3600 b/test/log/3600 index 3263418e1..0f4cae1df 100644 --- a/test/log/3600 +++ b/test/log/3600 @@ -1,16 +1,16 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=spa C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 sender address changed to <bad@test.ex> by CALLER -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 spa authenticator failed H=127.0.0.1 [127.0.0.1] 535 Incorrect authentication data 1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=r1 T=t1 defer (-42): authentication required but authentication attempt(s) failed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=spa:username S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 spa authenticator failed for localhost (myhost.test.ex) [127.0.0.1]: 535 Incorrect authentication data (set_id=username) 1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data diff --git a/test/log/3700 b/test/log/3700 index bb5d88f56..288943a1a 100644 --- a/test/log/3700 +++ b/test/log/3700 @@ -1,21 +1,21 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok@test.ex U=CALLER P=local S=sss for x@y 1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok@test.ex U=CALLER P=local S=sss for smtps@y -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client_r1 T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS_proto_and_cipher CV=yes C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => smtps@y R=client_r1 T=t2 H=127.0.0.1 [127.0.0.1]:PORT_S X=TLS_proto_and_cipher CV=yes C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D and for SMTPS on port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D and for SMTPS on port PORT_S 1999-03-02 09:44:33 Auth ACL called, after smtp cmd "STARTTLS" 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS_proto_and_cipher CV=yes A=tls:server2.example.org S=sss id=E10HmaX-0005vi-00@myhost.test.ex for x@y 1999-03-02 09:44:33 Auth ACL called, after smtp cmd "" 1999-03-02 09:44:33 10HmbA-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS_proto_and_cipher CV=yes A=tls:server2.example.org S=sss id=E10HmaY-0005vi-00@myhost.test.ex for smtps@y -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x <x@y> R=server_r T=file 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => smtps <smtps@y> R=server_r T=file 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 diff --git a/test/log/3720 b/test/log/3720 index 7757bf0ba..303a794e6 100644 --- a/test/log/3720 +++ b/test/log/3720 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok@test.ex U=CALLER P=local S=sss for x@y -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client_r1 T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS_proto_and_cipher CV=yes A=ext_ccert_cn C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Auth ACL called, after smtp cmd "AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==" 1999-03-02 09:44:33 Auth ACL called, after smtp cmd "AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS_proto_and_cipher CV=yes A=ext_ccert_cn:server2.example.org S=sss id=E10HmaX-0005vi-00@myhost.test.ex for x@y diff --git a/test/log/3721 b/test/log/3721 index 7757bf0ba..303a794e6 100644 --- a/test/log/3721 +++ b/test/log/3721 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok@test.ex U=CALLER P=local S=sss for x@y -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client_r1 T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS_proto_and_cipher CV=yes A=ext_ccert_cn C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 Auth ACL called, after smtp cmd "AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==" 1999-03-02 09:44:33 Auth ACL called, after smtp cmd "AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS_proto_and_cipher CV=yes A=ext_ccert_cn:server2.example.org S=sss id=E10HmaX-0005vi-00@myhost.test.ex for x@y diff --git a/test/log/3800 b/test/log/3800 index bc49c4aad..5eef80d41 100644 --- a/test/log/3800 +++ b/test/log/3800 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 sasl2 authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data (set_id=ph10) diff --git a/test/log/3820 b/test/log/3820 index bc49c4aad..5eef80d41 100644 --- a/test/log/3820 +++ b/test/log/3820 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 sasl2 authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data (set_id=ph10) diff --git a/test/log/3821 b/test/log/3821 index 6c79bedfd..746888247 100644 --- a/test/log/3821 +++ b/test/log/3821 @@ -6,6 +6,6 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=sasl2:ph10 S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=sasl3:ph10 S=sss id=E10HmaZ-0005vi-00@myhost.test.ex diff --git a/test/log/3825 b/test/log/3825 index 038a795d7..0b1466c97 100644 --- a/test/log/3825 +++ b/test/log/3825 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=sasl1:ph10 S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=sasl3:ph10 S=sss id=E10HmaZ-0005vi-00@myhost.test.ex diff --git a/test/log/3828 b/test/log/3828 index 63f3b34e4..0637547b6 100644 --- a/test/log/3828 +++ b/test/log/3828 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=sasl4:ph10 S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/3829 b/test/log/3829 index 69c2781d8..e0ef8f63f 100644 --- a/test/log/3829 +++ b/test/log/3829 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=sasl3:ph10 S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/3901 b/test/log/3901 index e9cef9837..fc4304ab5 100644 --- a/test/log/3901 +++ b/test/log/3901 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=dovecot:goodman S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/4021 b/test/log/4021 index 5729b657b..d477c62e0 100644 --- a/test/log/4021 +++ b/test/log/4021 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 pla ip4.ip4.ip4.ip4 plp 1225 pea 127.0.0.1 pep 48879 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1]:PORT_S PRX=[ip4.ip4.ip4.ip4]:PORT_D C="250 message accepted OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1]:PORT_S* PRX=[ip4.ip4.ip4.ip4]:PORT_D C="250 second message accepted OK" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq diff --git a/test/log/4027 b/test/log/4027 index 85e5899f1..f1513bc8a 100644 --- a/test/log/4027 +++ b/test/log/4027 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 pla ip4.ip4.ip4.ip4 plp 1225 pea 127.0.0.1 pep 48879 -1999-03-02 09:44:33 10HmaX-0005vi-00 => user_tfo@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1]:PORT_S PRX=[ip4.ip4.ip4.ip4]:PORT_D C="250 accepted OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 => user_tfo@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1]:PORT_S PRX=[ip4.ip4.ip4.ip4]:PORT_D TFO* C="250 accepted OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 pla ip4.ip4.ip4.ip4 plp 1225 pea 127.0.0.1 pep 48879 diff --git a/test/log/4030 b/test/log/4030 index 07838f869..08e827a50 100644 --- a/test/log/4030 +++ b/test/log/4030 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 proxy session: no 1999-03-02 09:44:33 local [127.0.0.1]:1111 1999-03-02 09:44:33 proxy internal []:0 diff --git a/test/log/4050 b/test/log/4050 index cd3b15785..ff9df8d42 100644 --- a/test/log/4050 +++ b/test/log/4050 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@test.ex H=(testclient) [127.0.0.1] P=esmtp L* S=sss for a@test.ex diff --git a/test/log/4051 b/test/log/4051 index d56d4061a..d0c4fa4f0 100644 --- a/test/log/4051 +++ b/test/log/4051 @@ -1,64 +1,64 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for notadvertised@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => notadvertised@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for clientno@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbD-0005vi-00 => clientno@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for helo_data@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbF-0005vi-00 => helo_data@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbG-0005vi-00" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for helo_data_bound@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbH-0005vi-00 => helo_data_bound@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L S=sss id=E10HmaX-0005vi-00@the.local.host.name for notadvertised@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1241 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <notadvertised@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1241 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1242, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L. S=sss id=E10HmaZ-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1243 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1243 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L* S=sss id=E10HmbB-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1244 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1244 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L. S=sss id=E10HmbD-0005vi-00@the.local.host.name for clientno@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1245 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <clientno@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1245 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@the.local.host.name H=(127.0.0.1) [127.0.0.1] P=esmtp L. S=sss id=E10HmbF-0005vi-00@the.local.host.name for helo_data@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1246 1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <helo_data@test.ex> R=server 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1246 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@the.local.host.name H=(127.0.0.1) [127.0.0.1] P=esmtp L* S=sss id=E10HmbH-0005vi-00@the.local.host.name for helo_data_bound@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1247 1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <helo_data_bound@test.ex> R=server 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1247 diff --git a/test/log/4052 b/test/log/4052 index d8b8b59b0..2ba876757 100644 --- a/test/log/4052 +++ b/test/log/4052 @@ -1,18 +1,18 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for client_old@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => client_old@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache2@test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 => nocache2@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 message accepted" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed @@ -54,19 +54,19 @@ 1999-03-02 09:44:33 10HmbP-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L. S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L* S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L. S=sss id=E10HmbB-0005vi-00@the.local.host.name for client_old@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <client_old@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1240 diff --git a/test/log/4053 b/test/log/4053 index 513aafcaa..188c6c375 100644 --- a/test/log/4053 +++ b/test/log/4053 @@ -1,23 +1,23 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L. K S=sss id=E10HmaX-0005vi-00@the.local.host.name -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L* K S=sss id=E10HmaZ-0005vi-00@the.local.host.name -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <b@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 diff --git a/test/log/4056 b/test/log/4056 index a61674766..2e1f0d7ce 100644 --- a/test/log/4056 +++ b/test/log/4056 @@ -1,15 +1,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] A=plain L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] A=plain L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 plain authenticator failed H=127.0.0.1 [127.0.0.1] 503 AUTH command used when not advertised 1999-03-02 09:44:33 10HmbB-0005vi-00 == c@test.ex R=client T=smtp defer (-42): authentication required but authentication attempt(s) failed @@ -20,13 +20,13 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpa L. A=plain:userx S=sss id=E10HmaX-0005vi-00@the.local.host.name 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpa L* A=plain:userx S=sss id=E10HmaZ-0005vi-00@the.local.host.name -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <b@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1237 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpa L. A=plain:userx S=sss id=E10HmbC-0005vi-00@the.local.host.name diff --git a/test/log/4058 b/test/log/4058 index 8b8630969..3a68e7899 100644 --- a/test/log/4058 +++ b/test/log/4058 @@ -1,44 +1,44 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaY-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1235 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* L* C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1235 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbB-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbC-0005vi-00" 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbD-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbE-0005vi-00" 2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1237 ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp L. S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1239 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1239 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtp L* S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1240 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 End queue run: pid=p1240 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO P=esmtp L. K S=sss id=E10HmbB-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbC-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtp L* K S=sss id=E10HmbD-0005vi-00@the.local.host.name for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1243 2017-07-30 18:51:05.712 10HmbE-0005vi-00 => :blackhole: <chunking@test.ex> R=server 2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1243 diff --git a/test/log/4060 b/test/log/4060 index 6abaa0c74..bf869ad85 100644 --- a/test/log/4060 +++ b/test/log/4060 @@ -1,54 +1,54 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmaY-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1235 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1235 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for clientno@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbB-0005vi-00 => clientno@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmbC-0005vi-00" 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbD-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbE-0005vi-00" 2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1238 2017-07-30 18:51:05.712 10HmbF-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbG-0005vi-00" 2017-07-30 18:51:05.712 10HmbF-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1238 ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1240 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1240 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1241 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1241 2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@the.local.host.name for clientno@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbC-0005vi-00 => :blackhole: <clientno@test.ex> R=server 2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 End queue run: pid=p1242 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1243, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbD-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1244 2017-07-30 18:51:05.712 10HmbE-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1244 2017-07-30 18:51:05.712 10HmbG-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbF-0005vi-00@the.local.host.name for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1245 2017-07-30 18:51:05.712 10HmbG-0005vi-00 => :blackhole: <chunking@test.ex> R=server 2017-07-30 18:51:05.712 10HmbG-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1245 diff --git a/test/log/4061 b/test/log/4061 index 1bf512cb1..620521fc8 100644 --- a/test/log/4061 +++ b/test/log/4061 @@ -1,33 +1,33 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for clientno@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => clientno@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@the.local.host.name for clientno@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <clientno@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1240 diff --git a/test/log/4062 b/test/log/4062 index d3b90c476..a2f883100 100644 --- a/test/log/4062 +++ b/test/log/4062 @@ -1,66 +1,66 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmaY-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1235 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1235 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for client_no@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbB-0005vi-00 => client_no@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmbC-0005vi-00" 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for server_oops@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbD-0005vi-00 => server_oops@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmbE-0005vi-00" 2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1238 2017-07-30 18:51:05.712 10HmbF-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbG-0005vi-00" 2017-07-30 18:51:05.712 10HmbF-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1238 2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1239 2017-07-30 18:51:05.712 10HmbH-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbI-0005vi-00" 2017-07-30 18:51:05.712 10HmbH-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1239 ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1241 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1241 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@the.local.host.name for client_no@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1243 2017-07-30 18:51:05.712 10HmbC-0005vi-00 => :blackhole: <client_no@test.ex> R=server 2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 End queue run: pid=p1243 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1244, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 SMTP protocol synchronization error (input sent without waiting for greeting): rejected connection from H=[127.0.0.1] input="EHLO the.local.host.name\r\nSTARTTLS\r\n" 2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@the.local.host.name for server_oops@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1245 2017-07-30 18:51:05.712 10HmbE-0005vi-00 => :blackhole: <server_oops@test.ex> R=server 2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 End queue run: pid=p1245 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1246, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmbG-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbF-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1247 2017-07-30 18:51:05.712 10HmbG-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbG-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1247 2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbH-0005vi-00@the.local.host.name for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1248 2017-07-30 18:51:05.712 10HmbI-0005vi-00 => :blackhole: <chunking@test.ex> R=server 2017-07-30 18:51:05.712 10HmbI-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1248 diff --git a/test/log/4063 b/test/log/4063 index 04660c835..b6d245cda 100644 --- a/test/log/4063 +++ b/test/log/4063 @@ -1,33 +1,33 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for a@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for c@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => c@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for a@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for b@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <b@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@the.local.host.name for c@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <c@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1240 diff --git a/test/log/4064 b/test/log/4064 index 08fddf3e5..4f31b9387 100644 --- a/test/log/4064 +++ b/test/log/4064 @@ -1,48 +1,48 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbD-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1240 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx K S=sss id=E10HmbB-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1242 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1242 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx K S=sss id=E10HmbD-0005vi-00@the.local.host.name for chunking@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1243 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <chunking@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1243 diff --git a/test/log/4065 b/test/log/4065 index 35d3a644b..6b051bb7a 100644 --- a/test/log/4065 +++ b/test/log/4065 @@ -1,23 +1,23 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 diff --git a/test/log/4066 b/test/log/4066 index 08fddf3e5..4f31b9387 100644 --- a/test/log/4066 +++ b/test/log/4066 @@ -1,48 +1,48 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbD-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 no IP address found for host OPT (during SMTP connection from localhost (the.local.host.name) [127.0.0.1]) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1240 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx K S=sss id=E10HmbB-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1242 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1242 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx K S=sss id=E10HmbD-0005vi-00@the.local.host.name for chunking@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1243 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <chunking@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1243 diff --git a/test/log/4067 b/test/log/4067 index 35d3a644b..6b051bb7a 100644 --- a/test/log/4067 +++ b/test/log/4067 @@ -1,23 +1,23 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => hascache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain L* C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@the.local.host.name for nocache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nocache@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtpsa L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no A=plain:userx S=sss id=E10HmaZ-0005vi-00@the.local.host.name for hascache@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <hascache@test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 diff --git a/test/log/4068 b/test/log/4068 index f5e40ffcc..7a216dca9 100644 --- a/test/log/4068 +++ b/test/log/4068 @@ -1,44 +1,44 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for a@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => a@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmaY-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for b@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1235 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => b@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1235 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbB-0005vi-00 => nocache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbC-0005vi-00" 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbD-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbE-0005vi-00" 2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1237 ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for a@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1239 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1239 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for b@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1240 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <b@test.ex> R=server 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 End queue run: pid=p1240 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbB-0005vi-00@the.local.host.name for nocache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbC-0005vi-00 => :blackhole: <nocache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbD-0005vi-00@the.local.host.name for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1243 2017-07-30 18:51:05.712 10HmbE-0005vi-00 => :blackhole: <chunking@test.ex> R=server 2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1243 diff --git a/test/log/4069 b/test/log/4069 index 930a3f093..cb330d3fb 100644 --- a/test/log/4069 +++ b/test/log/4069 @@ -1,44 +1,44 @@ 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for a@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaX-0005vi-00 => a@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L C="250 OK id=10HmaY-0005vi-00" 2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1234 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for b@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1235 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => b@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbA-0005vi-00" 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1235 2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for wrongcache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbB-0005vi-00 => wrongcache@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* C="250 OK id=10HmbC-0005vi-00" 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1236 2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1237 2017-07-30 18:51:05.712 10HmbD-0005vi-00 => chunking@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] TFO* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no L* K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbE-0005vi-00" 2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1237 ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtps L. X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for a@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1239 2017-07-30 18:51:05.712 10HmaY-0005vi-00 => :blackhole: <a@test.ex> R=server 2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1239 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for b@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1240 2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <b@test.ex> R=server 2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 End queue run: pid=p1240 +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@the.local.host.name for wrongcache@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbC-0005vi-00 => :blackhole: <wrongcache@test.ex> R=server 2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1242 2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] TFO* P=esmtps L* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmbD-0005vi-00@the.local.host.name for chunking@test.ex -2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 Start queue run: pid=p1243 2017-07-30 18:51:05.712 10HmbE-0005vi-00 => :blackhole: <chunking@test.ex> R=server 2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp +2017-07-30 18:51:05.712 End queue run: pid=p1243 diff --git a/test/log/4201 b/test/log/4201 index 73d9b2d44..635d49cb1 100644 --- a/test/log/4201 +++ b/test/log/4201 @@ -3,12 +3,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for usery@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userx@test.ex> R=localuser @@ -17,5 +17,5 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <usery@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4202 b/test/log/4202 index 6916ec39f..e97f42bb3 100644 --- a/test/log/4202 +++ b/test/log/4202 @@ -9,15 +9,15 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= user.dontcare@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for userx@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= user.dontcare@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.他们为什么不说中文@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 <= 他们为什么不说中文@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name for userx@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <user.他们为什么不说中文@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <userx@test.ex> R=localuser 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4203 b/test/log/4203 index 0b1a244aa..c3d01c560 100644 --- a/test/log/4203 +++ b/test/log/4203 @@ -4,10 +4,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qfl +1999-03-02 09:44:33 Start queue run: pid=p1234 -qfl 1999-03-02 09:44:33 10HmaY-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qfl +1999-03-02 09:44:33 End queue run: pid=p1234 -qfl ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4204 b/test/log/4204 index 2aa2ba9f5..5c52f372d 100644 --- a/test/log/4204 +++ b/test/log/4204 @@ -8,14 +8,14 @@ 1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted 1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userQ@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userR@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4205 b/test/log/4205 index 8f1da1a4a..5bad480bc 100644 --- a/test/log/4205 +++ b/test/log/4205 @@ -3,9 +3,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4206 b/test/log/4206 index 28cf48806..8dfc9f6d7 100644 --- a/test/log/4206 +++ b/test/log/4206 @@ -10,14 +10,14 @@ 1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted 1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.அதிமதுரம்@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <user.ഇരട്ടിമധുരം@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4207 b/test/log/4207 index 3318ffe17..bd9746620 100644 --- a/test/log/4207 +++ b/test/log/4207 @@ -9,15 +9,15 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for xn--user1.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for xn--user2.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name for xn--user3.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <xn--user1.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <xn--user2.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <xn--user3.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex> R=localuser 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4208 b/test/log/4208 index 16b12a6a0..b8e9b965b 100644 --- a/test/log/4208 +++ b/test/log/4208 @@ -1,4 +1,4 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted diff --git a/test/log/4209 b/test/log/4209 index b521c91cb..3e9d9efcc 100644 --- a/test/log/4209 +++ b/test/log/4209 @@ -6,15 +6,15 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.他们为什么不说中文@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.他们为什么不说中文@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@test1.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for xn--user.-si1hohvdvf05c4gvj200y0o6f@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1237 -qqff 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <xn--user.-si1hohvdvf05c4gvj200y0o6f@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1237 -qqff diff --git a/test/log/4221 b/test/log/4221 index 80da6a500..bd95e7f8b 100644 --- a/test/log/4221 +++ b/test/log/4221 @@ -3,15 +3,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userx@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <usery@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4223 b/test/log/4223 index 1e5f3796b..98c2dfdaa 100644 --- a/test/log/4223 +++ b/test/log/4223 @@ -4,10 +4,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qfl +1999-03-02 09:44:33 Start queue run: pid=p1234 -qfl 1999-03-02 09:44:33 10HmaY-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qfl +1999-03-02 09:44:33 End queue run: pid=p1234 -qfl ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4224 b/test/log/4224 index 3f91cfb4a..14c1d4eb3 100644 --- a/test/log/4224 +++ b/test/log/4224 @@ -8,14 +8,14 @@ 1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted 1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userQ@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <userR@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4225 b/test/log/4225 index b03260868..762ddfad2 100644 --- a/test/log/4225 +++ b/test/log/4225 @@ -3,9 +3,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff diff --git a/test/log/4226 b/test/log/4226 index b5948a9a8..b14124b09 100644 --- a/test/log/4226 +++ b/test/log/4226 @@ -10,14 +10,14 @@ 1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex 1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted 1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqff +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.அதிமதுரம்@test.ex> R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <user.ഇരട്ടിമധുരം@test.ex> R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqff -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1235 -qqff +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4500 b/test/log/4500 index ebb3ead85..293e79e05 100644 --- a/test/log/4500 +++ b/test/log/4500 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 @@ -17,13 +17,13 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=ses_sha1 c=simple/simple a=rsa-sha1 b=512 [verification succeeded] 1999-03-02 09:44:33 10HmbA-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=ses_sha1 header.a=rsa-sha1 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 NOTE: forcing dkim verify fail (was pass) 1999-03-02 09:44:33 10HmbB-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmbB-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [fail - hash too weak] 1999-03-02 09:44:33 10HmbB-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=policy (fail - hash too weak) header.d=test.ex header.s=sel header.a=rsa-sha1 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 signer: test.ex bits: 512 1999-03-02 09:44:33 10HmbC-0005vi-00 DKIM: d=test.ex s=ses c=simple/simple a=rsa-sha1 b=512 [verification failed - signature invalid (key too short)] 1999-03-02 09:44:33 10HmbC-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=fail (public key too short: 512 bits)\n header.d=test.ex header.s=ses header.a=rsa-sha1 diff --git a/test/log/4501 b/test/log/4501 index 2ab144416..3542e2f67 100644 --- a/test/log/4501 +++ b/test/log/4501 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 diff --git a/test/log/4502 b/test/log/4502 index ed74d275c..426a7d2b9 100644 --- a/test/log/4502 +++ b/test/log/4502 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha1 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 diff --git a/test/log/4503 b/test/log/4503 index 69730db21..8d3d93557 100644 --- a/test/log/4503 +++ b/test/log/4503 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha512 diff --git a/test/log/4504 b/test/log/4504 index 69730db21..8d3d93557 100644 --- a/test/log/4504 +++ b/test/log/4504 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha512 diff --git a/test/log/4506 b/test/log/4506 index 9aa3604c0..7301abddf 100644 --- a/test/log/4506 +++ b/test/log/4506 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 signer: test.ex bits: 0 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=0 [invalid - signature tag missing or invalid] 1999-03-02 09:44:33 10HmaY-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=neutral (signature tag missing or invalid)\n header.d=test.ex header.s=sel header.a=rsa-sha1 @@ -25,13 +25,13 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 DKIM: Error during validation, disabling signature verification: EXCESS_SIGS 1999-03-02 09:44:33 10HmbD-0005vi-00 Authentication-Results: myhost.test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=20180418125440.Horde.vVKB6E7UvpLfJsPzv2ZPs6z@webmail.sego.es -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbE-0005vi-00 unknown 1999-03-02 09:44:33 10HmbE-0005vi-00 signer: test.ex bits: 0 1999-03-02 09:44:33 10HmbE-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=0 [invalid - signature tag missing or invalid] 1999-03-02 09:44:33 10HmbE-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=neutral (signature tag missing or invalid)\n header.d=test.ex header.s=sel header.a=rsa-sha1 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 0 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=0 [invalid - signature tag missing or invalid] 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(xxx) [127.0.0.1] rejected DKIM diff --git a/test/log/4508 b/test/log/4508 index a78f04e78..269d55949 100644 --- a/test/log/4508 +++ b/test/log/4508 @@ -1,22 +1,22 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: acl called - signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 overall $dkim_verify_status: pass 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha256 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaY-0005vi-00 overall $dkim_verify_status: 1999-03-02 09:44:33 10HmaY-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha256 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: acl called - signer: nothere.example.com bits: 0 1999-03-02 09:44:33 10HmaZ-0005vi-00 overall $dkim_verify_status: none 1999-03-02 09:44:33 10HmaZ-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha256 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: acl called - signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: acl called - signer: different.example.com bits: 1024 diff --git a/test/log/4509 b/test/log/4509 index 0ab1a76f9..d9ab11752 100644 --- a/test/log/4509 +++ b/test/log/4509 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net diff --git a/test/log/4510 b/test/log/4510 index 9d5e645aa..3d0400eb5 100644 --- a/test/log/4510 +++ b/test/log/4510 @@ -35,7 +35,7 @@ 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaZ-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From 1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] diff --git a/test/log/4511 b/test/log/4511 index 884906850..51391c6f3 100644 --- a/test/log/4511 +++ b/test/log/4511 @@ -6,7 +6,7 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_S 2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=E10HmaX-0005vi-00@testhost.test.ex for a@test.ex 2017-07-30 18:51:05.712 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] diff --git a/test/log/4512 b/test/log/4512 index 7abd59e3e..89d608521 100644 --- a/test/log/4512 +++ b/test/log/4512 @@ -1,6 +1,6 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_S 2017-07-30 18:51:05.712 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net for a@test.ex 2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] diff --git a/test/log/4513 b/test/log/4513 index cd1ba4fb9..43edebc60 100644 --- a/test/log/4513 +++ b/test/log/4513 @@ -3,7 +3,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:From 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] diff --git a/test/log/4514 b/test/log/4514 index 398c4b8e1..d5689cbbc 100644 --- a/test/log/4514 +++ b/test/log/4514 @@ -3,7 +3,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 512 h=From:To:Subject 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded] diff --git a/test/log/4515 b/test/log/4515 index f4b7496d5..046cb6fec 100644 --- a/test/log/4515 +++ b/test/log/4515 @@ -15,7 +15,7 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From 1999-03-02 09:44:33 10HmaY-0005vi-00 data acl: dkim status pass diff --git a/test/log/4519 b/test/log/4519 index b489d9c1d..341470b85 100644 --- a/test/log/4519 +++ b/test/log/4519 @@ -1,12 +1,12 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => z <z@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => y <y@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_S port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp S=sss for z@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex for z@test.ex diff --git a/test/log/4520 b/test/log/4520 index d95ba46fa..187c9254c 100644 --- a/test/log/4520 +++ b/test/log/4520 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 @@ -21,7 +21,7 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 NOTE: forcing dkim verify fail (was pass) 1999-03-02 09:44:33 10HmbB-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmbB-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [fail - hash too weak] @@ -29,7 +29,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=qwerty1234@disco-zombie.net 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 signer: test.ex bits: 512 1999-03-02 09:44:33 10HmbC-0005vi-00 DKIM: d=test.ex s=ses c=simple/simple a=rsa-sha1 b=512 [verification failed - signature invalid (key too short)] 1999-03-02 09:44:33 10HmbC-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=fail (public key too short: 512 bits)\n header.d=test.ex header.s=ses header.a=rsa-sha1 diff --git a/test/log/4521 b/test/log/4521 index f80928920..121052dc2 100644 --- a/test/log/4521 +++ b/test/log/4521 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 diff --git a/test/log/4522 b/test/log/4522 index 7eca7c0fe..05249ba14 100644 --- a/test/log/4522 +++ b/test/log/4522 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha1 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 diff --git a/test/log/4523 b/test/log/4523 index b35e93756..5b8bcb9e1 100644 --- a/test/log/4523 +++ b/test/log/4523 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha512 diff --git a/test/log/4524 b/test/log/4524 index b35e93756..5b8bcb9e1 100644 --- a/test/log/4524 +++ b/test/log/4524 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha512 diff --git a/test/log/4526 b/test/log/4526 index e523126ff..7d94b91dd 100644 --- a/test/log/4526 +++ b/test/log/4526 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 signer: test.ex bits: 0 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=0 [invalid - signature tag missing or invalid] 1999-03-02 09:44:33 10HmaY-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=neutral (signature tag missing or invalid)\n header.d=test.ex header.s=sel header.a=rsa-sha1 @@ -29,7 +29,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=20180418125440.Horde.vVKB6E7UvpLfJsPzv2ZPs6z@webmail.sego.es 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbE-0005vi-00 unknown 1999-03-02 09:44:33 10HmbE-0005vi-00 signer: test.ex bits: 0 1999-03-02 09:44:33 10HmbE-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=0 [invalid - signature tag missing or invalid] @@ -37,7 +37,7 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=qwerty1234@disco-zombie.net 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 0 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=0 [invalid - signature tag missing or invalid] 1999-03-02 09:44:33 10HmaX-0005vi-00 H=(xxx) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no rejected DKIM diff --git a/test/log/4528 b/test/log/4528 index 00570960e..07c4ada88 100644 --- a/test/log/4528 +++ b/test/log/4528 @@ -2,7 +2,7 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: acl called - signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 overall $dkim_verify_status: pass @@ -10,21 +10,21 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaY-0005vi-00 overall $dkim_verify_status: 1999-03-02 09:44:33 10HmaY-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha256 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: acl called - signer: nothere.example.com bits: 0 1999-03-02 09:44:33 10HmaZ-0005vi-00 overall $dkim_verify_status: none 1999-03-02 09:44:33 10HmaZ-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha256 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=qwerty1234@disco-zombie.net 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: acl called - signer: test.ex bits: 1024 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: acl called - signer: different.example.com bits: 1024 diff --git a/test/log/4529 b/test/log/4529 index 0c670389e..92725f77a 100644 --- a/test/log/4529 +++ b/test/log/4529 @@ -2,6 +2,6 @@ ******** SERVER ******** 1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one. Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=qwerty1234@disco-zombie.net diff --git a/test/log/4530 b/test/log/4530 index 43ab3172e..a13a393d6 100644 --- a/test/log/4530 +++ b/test/log/4530 @@ -35,7 +35,7 @@ 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaZ-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From 1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] diff --git a/test/log/4531 b/test/log/4531 index 6740cabbf..bae23797e 100644 --- a/test/log/4531 +++ b/test/log/4531 @@ -6,7 +6,7 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_S 2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] 2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss DKIM=test.ex id=E10HmaX-0005vi-00@testhost.test.ex for a@test.ex 2017-07-30 18:51:05.712 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] diff --git a/test/log/4532 b/test/log/4532 index 5b341aba7..8367ca368 100644 --- a/test/log/4532 +++ b/test/log/4532 @@ -1,6 +1,6 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_S 2017-07-30 18:51:05.712 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] 2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net for a@test.ex 2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] diff --git a/test/log/4533 b/test/log/4533 index 315700ecd..9caf403a1 100644 --- a/test/log/4533 +++ b/test/log/4533 @@ -3,7 +3,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:From 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] diff --git a/test/log/4534 b/test/log/4534 index faac1b64e..a72149e69 100644 --- a/test/log/4534 +++ b/test/log/4534 @@ -3,7 +3,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 512 h=From:To:Subject 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded] diff --git a/test/log/4535 b/test/log/4535 index 2e7fcf26d..fb28d4999 100644 --- a/test/log/4535 +++ b/test/log/4535 @@ -15,7 +15,7 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From 1999-03-02 09:44:33 10HmaY-0005vi-00 data acl: dkim status pass diff --git a/test/log/4539 b/test/log/4539 index 78ad87365..c2beca808 100644 --- a/test/log/4539 +++ b/test/log/4539 @@ -1,12 +1,12 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => z <z@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => y <y@test.ex> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_S port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss for z@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss DKIM=test.ex for z@test.ex diff --git a/test/log/4540 b/test/log/4540 index 4018c7fa2..137d68d51 100644 --- a/test/log/4540 +++ b/test/log/4540 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 signer: test.ex bits: 253 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sed header.a=ed25519-sha256 @@ -15,7 +15,7 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=kitterman.org s=ed25519 c=relaxed/simple a=ed25519-sha256 b=512 i=@kitterman.org t=1517847601 [verification succeeded] 1999-03-02 09:44:33 10HmbA-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=kitterman.org header.i=@kitterman.org header.s=ed25519 header.a=ed25519-sha256 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=kitterman.org id=example@example.com -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 signer: test.ex bits: 253 1999-03-02 09:44:33 10HmbB-0005vi-00 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification failed - signature invalid (key too short)] 1999-03-02 09:44:33 10HmbB-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=fail (public key too short: 253 bits)\n header.d=test.ex header.s=sed header.a=ed25519-sha256 diff --git a/test/log/4541 b/test/log/4541 index 78e3b85b2..735f0e9fe 100644 --- a/test/log/4541 +++ b/test/log/4541 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 253 h=From 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded] @@ -16,7 +16,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => a <a@test.ex> R=server_store T=file 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmbA-0005vi-00 dkim_acl: signer: test.ex bits: 253 h=From 1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded] diff --git a/test/log/4545 b/test/log/4545 index bf44330f9..4b4e3858d 100644 --- a/test/log/4545 +++ b/test/log/4545 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 253 h=From:To:Subject 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded] diff --git a/test/log/4550 b/test/log/4550 index 29183f5dc..4cd943e4e 100644 --- a/test/log/4550 +++ b/test/log/4550 @@ -7,7 +7,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 signer: test.ex bits: 1024 h=From 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<baduser@test.ex> refusal diff --git a/test/log/4560 b/test/log/4560 index 1c4f08a30..9e51addcd 100644 --- a/test/log/4560 +++ b/test/log/4560 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmaX-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_oldest_pass <1> @@ -9,10 +9,10 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 lh-ams: < i=1; test.ex; arc=none> 1999-03-02 09:44:33 10HmaX-0005vi-00 oldest-p-ams: <i=1; test.ex; arc=none> 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss ARC id=qwerty1234@disco-zombie.net for a@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmaY-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmaY-0005vi-00 arc_oldest_pass <0> @@ -21,7 +21,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmaY-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for za@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaZ-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmaZ-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmaZ-0005vi-00 arc_oldest_pass <1> @@ -32,11 +32,11 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmaZ-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 1999-03-02 09:44:33 10HmbA-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmbA-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmbA-0005vi-00 arc_oldest_pass <0> @@ -45,7 +45,7 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmbA-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zza@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbB-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbB-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmbB-0005vi-00 arc_oldest_pass <1> @@ -56,8 +56,8 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for za@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => za@test.ex <zza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbC-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbC-0005vi-00 domains: <test.ex:test.ex> 1999-03-02 09:44:33 10HmbC-0005vi-00 arc_oldest_pass <1> @@ -68,11 +68,11 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 +1999-03-02 09:44:33 Start queue run: pid=p1240 1999-03-02 09:44:33 10HmbC-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1240 1999-03-02 09:44:33 10HmbD-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmbD-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmbD-0005vi-00 arc_oldest_pass <0> @@ -81,7 +81,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmbD-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zmza@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1241 1999-03-02 09:44:33 10HmbE-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbE-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmbE-0005vi-00 arc_oldest_pass <1> @@ -92,8 +92,8 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for mza@test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 => mza@test.ex <zmza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1241 +1999-03-02 09:44:33 Start queue run: pid=p1242 1999-03-02 09:44:33 10HmbF-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbF-0005vi-00 domains: <test.ex:test.ex> 1999-03-02 09:44:33 10HmbF-0005vi-00 arc_oldest_pass <2> @@ -104,8 +104,8 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for za@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => za@test.ex <mza@test.ex> R=mlist T=tmlist H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1242 +1999-03-02 09:44:33 Start queue run: pid=p1243 1999-03-02 09:44:33 10HmbG-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbG-0005vi-00 domains: <test.ex:test.ex:test.ex> 1999-03-02 09:44:33 10HmbG-0005vi-00 arc_oldest_pass <2> @@ -116,11 +116,11 @@ 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-0005vi-00" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1243 +1999-03-02 09:44:33 Start queue run: pid=p1244 1999-03-02 09:44:33 10HmbG-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1244 1999-03-02 09:44:33 10HmbH-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmbH-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmbH-0005vi-00 arc_oldest_pass <0> @@ -129,7 +129,7 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmbH-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zzmza@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1245 1999-03-02 09:44:33 10HmbI-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbI-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmbI-0005vi-00 arc_oldest_pass <1> @@ -140,8 +140,8 @@ 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for zmza@test.ex 1999-03-02 09:44:33 10HmbH-0005vi-00 => zmza@test.ex <zzmza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1245 +1999-03-02 09:44:33 Start queue run: pid=p1246 1999-03-02 09:44:33 10HmbJ-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbJ-0005vi-00 domains: <test.ex:test.ex> 1999-03-02 09:44:33 10HmbJ-0005vi-00 arc_oldest_pass <1> @@ -152,8 +152,8 @@ 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for mza@test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 => mza@test.ex <zmza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-0005vi-00" 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1246 +1999-03-02 09:44:33 Start queue run: pid=p1247 1999-03-02 09:44:33 10HmbK-0005vi-00 arc_state: <fail> 1999-03-02 09:44:33 10HmbK-0005vi-00 domains: <test.ex:test.ex> 1999-03-02 09:44:33 10HmbK-0005vi-00 arc_oldest_pass <0> @@ -164,8 +164,8 @@ 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss for za@test.ex 1999-03-02 09:44:33 10HmbJ-0005vi-00 => za@test.ex <mza@test.ex> R=mlist T=tmlist H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-0005vi-00" 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1247 +1999-03-02 09:44:33 Start queue run: pid=p1248 1999-03-02 09:44:33 10HmbL-0005vi-00 arc_state: <fail> 1999-03-02 09:44:33 10HmbL-0005vi-00 domains: <test.ex:test.ex:test.ex> 1999-03-02 09:44:33 10HmbL-0005vi-00 arc_oldest_pass <0> @@ -176,11 +176,11 @@ 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss for a@test.ex 1999-03-02 09:44:33 10HmbK-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1248 +1999-03-02 09:44:33 Start queue run: pid=p1249 1999-03-02 09:44:33 10HmbL-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1249 1999-03-02 09:44:33 10HmbM-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmbM-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmbM-0005vi-00 arc_oldest_pass <0> @@ -189,7 +189,7 @@ 1999-03-02 09:44:33 10HmbM-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmbM-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zza@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1250 1999-03-02 09:44:33 10HmbN-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbN-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmbN-0005vi-00 arc_oldest_pass <1> @@ -200,8 +200,8 @@ 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for za@test.ex 1999-03-02 09:44:33 10HmbM-0005vi-00 => za@test.ex <zza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1250 +1999-03-02 09:44:33 Start queue run: pid=p1251 1999-03-02 09:44:33 10HmbO-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmbO-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmbO-0005vi-00 arc_oldest_pass <1> @@ -212,11 +212,11 @@ 1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex 1999-03-02 09:44:33 10HmbN-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbO-0005vi-00" 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1251 +1999-03-02 09:44:33 Start queue run: pid=p1252 1999-03-02 09:44:33 10HmbO-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1252 1999-03-02 09:44:33 10HmbP-0005vi-00 DKIM: d=dmarc.org s=clochette c=simple/simple a=rsa-sha256 b=1024 t=1517535263 [verification succeeded] 1999-03-02 09:44:33 10HmbP-0005vi-00 DKIM: d=convivian.com s=default c=simple/simple a=rsa-sha256 b=1024 t=1517535248 [verification failed - body hash mismatch (body probably modified in transit)] 1999-03-02 09:44:33 10HmbP-0005vi-00 arc_state: <fail> @@ -227,7 +227,7 @@ 1999-03-02 09:44:33 10HmbP-0005vi-00 lh-ams: < i=1; mailhub.convivian.com; none> 1999-03-02 09:44:33 10HmbP-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=dmarc.org id=1426665656.110316.1517535248039.JavaMail.zimbra@convivian.com for za@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1253 1999-03-02 09:44:33 10HmbQ-0005vi-00 DKIM: d=dmarc.org s=clochette c=simple/simple a=rsa-sha256 b=1024 t=1517535263 [verification succeeded] 1999-03-02 09:44:33 10HmbQ-0005vi-00 DKIM: d=convivian.com s=default c=simple/simple a=rsa-sha256 b=1024 t=1517535248 [verification failed - body hash mismatch (body probably modified in transit)] 1999-03-02 09:44:33 10HmbQ-0005vi-00 arc_state: <fail> @@ -240,11 +240,11 @@ 1999-03-02 09:44:33 10HmbQ-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss DKIM=dmarc.org id=1426665656.110316.1517535248039.JavaMail.zimbra@convivian.com for a@test.ex 1999-03-02 09:44:33 10HmbP-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbQ-0005vi-00" 1999-03-02 09:44:33 10HmbP-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1253 +1999-03-02 09:44:33 Start queue run: pid=p1254 1999-03-02 09:44:33 10HmbQ-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1254 1999-03-02 09:44:33 10HmbR-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmbR-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmbR-0005vi-00 arc_oldest_pass <0> @@ -253,7 +253,7 @@ 1999-03-02 09:44:33 10HmbR-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmbR-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmbR-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for za@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1255 1999-03-02 09:44:33 10HmbR-0005vi-00 ARC: AMS signing: privkey PEM-block import: error:0906D06C:PEM routines:PEM_read_bio:no start line 1999-03-02 09:44:33 10HmbS-0005vi-00 arc_state: <none> @@ -266,12 +266,12 @@ 1999-03-02 09:44:33 10HmbS-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss for a@test.ex 1999-03-02 09:44:33 10HmbR-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbS-0005vi-00" 1999-03-02 09:44:33 10HmbR-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1255 +1999-03-02 09:44:33 Start queue run: pid=p1256 1999-03-02 09:44:33 10HmbS-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmbS-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1256 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1257, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbT-0005vi-00 H=(xxx) [127.0.0.1] Warning: ARC-FAIL 1999-03-02 09:44:33 10HmbT-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmbT-0005vi-00 domains: <> diff --git a/test/log/4561 b/test/log/4561 index 2d4175c25..05fc90767 100644 --- a/test/log/4561 +++ b/test/log/4561 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_state: <fail> 1999-03-02 09:44:33 10HmaX-0005vi-00 domains: <::test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_oldest_pass <0> @@ -9,7 +9,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 lh-ams: < i=2; test.ex;\n iprev=fail;\n auth=pass (PLAIN) smtp.auth=fred@test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=3885245d-3bae-66a2-7a1e-0dbceae2fb50@test.ex for a@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/4562 b/test/log/4562 index b4320bf24..ba9da8d3a 100644 --- a/test/log/4562 +++ b/test/log/4562 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_state: <pass> 1999-03-02 09:44:33 10HmaX-0005vi-00 domains: <test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_oldest_pass <1> @@ -17,9 +17,9 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 lh-ams: <> 1999-03-02 09:44:33 10HmaY-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmaY-0005vi-00 <= no_arc@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net for a@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/4563 b/test/log/4563 index 930844b04..7837d1d4b 100644 --- a/test/log/4563 +++ b/test/log/4563 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_state: <fail> 1999-03-02 09:44:33 10HmaX-0005vi-00 domains: <test.ex:test.ex> 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_oldest_pass <0> @@ -9,7 +9,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 lh-ams: < i=2; test.ex; arc=none: i=1; test.ex; arc=none> 1999-03-02 09:44:33 10HmaX-0005vi-00 oldest-p-ams: <> 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net for a@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaX-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 diff --git a/test/log/4565 b/test/log/4565 index 1538e6a0c..d8a049615 100644 --- a/test/log/4565 +++ b/test/log/4565 @@ -1,12 +1,12 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=example.com s=sel c=relaxed/relaxed a=rsa-sha256 b=2048 [verification failed - body hash mismatch (body probably modified in transit)] 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_state: <none> 1999-03-02 09:44:33 10HmaX-0005vi-00 arc_oldest_pass <0> 1999-03-02 09:44:33 10HmaX-0005vi-00 domains: <> 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net for za@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=example.com s=sel c=relaxed/relaxed a=rsa-sha256 b=2048 [verification failed - body hash mismatch (body probably modified in transit)] 1999-03-02 09:44:33 10HmaY-0005vi-00 arc_state: <pass> @@ -15,8 +15,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss DKIM=test.ex ARC id=qwerty1234@disco-zombie.net for a@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmaY-0005vi-00 => a <a@test.ex> R=d1 T=tfile 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 diff --git a/test/log/4600 b/test/log/4600 index dabeaf19d..c63c339b6 100644 --- a/test/log/4600 +++ b/test/log/4600 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S port PORT_D2 +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D port PORT_S port PORT_D2 1999-03-02 09:44:33 spf_result pass 1999-03-02 09:44:33 spf_header_comment myhost.test.ex: localhost is always allowed. 1999-03-02 09:44:33 spf_smtp_comment diff --git a/test/log/4601 b/test/log/4601 index 7f53849f4..f49083221 100644 --- a/test/log/4601 +++ b/test/log/4601 @@ -1,5 +1,5 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D port PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D port PORT_S 1999-03-02 09:44:33 a@example.com [127.0.0.1] lookup: 'pass' 1999-03-02 09:44:33 b@example.com [127.0.0.1] lookup: 'pass' diff --git a/test/log/4620 b/test/log/4620 index 4797d5674..9af4e8ebd 100644 --- a/test/log/4620 +++ b/test/log/4620 @@ -1,38 +1,38 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for redirect@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => remote_user@remote.ex <redirect@test.ex> P=<SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex> R=external T=forwarded_external H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 ** remote_user@remote.ex R=remote_bouncer: account disabled 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 +1999-03-02 09:44:33 Start queue run: pid=p1235 1999-03-02 09:44:33 10HmaZ-0005vi-00 => SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex> P=<> R=bounce_return T=to_external H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1235 +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex> P=<> R=local T=appendfile 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbB-0005vi-00 <= "fred["@test.ex U=root P=local S=sss for redirect@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 => remote_user@remote.ex <redirect@test.ex> P=<"SRS0=ZZZZ=YY=test.ex=fred["@test.ex> R=external T=forwarded_external H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1237 1999-03-02 09:44:33 10HmbC-0005vi-00 ** remote_user@remote.ex R=remote_bouncer: account disabled 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1237 +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbD-0005vi-00 => SRS0=ZZZZ=YY=test.ex=fred[@test.ex <"SRS0=ZZZZ=YY=test.ex=fred["@test.ex> P=<> R=bounce_return T=to_external H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 +1999-03-02 09:44:33 Start queue run: pid=p1239 1999-03-02 09:44:33 10HmbE-0005vi-00 => fred[ <"SRS0=ZZZZ=YY=test.ex=fred["@test.ex> P=<> R=local T=appendfile 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1239 ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:PORT_S +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on [127.0.0.1]:PORT_S 1999-03-02 09:44:33 10HmaY-0005vi-00 <= SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for remote_user@remote.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 <= "SRS0=ZZZZ=YY=test.ex=fred["@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name for remote_user@remote.ex diff --git a/test/log/4700 b/test/log/4700 index 8a1a7a4f4..ae65b2b65 100644 --- a/test/log/4700 +++ b/test/log/4700 @@ -1,18 +1,18 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F=<CALLER@test.ex> R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> F=<> R=all T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F=<CALLER@test.ex> R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away diff --git a/test/log/4710 b/test/log/4710 index 6e70d69ad..3937611b8 100644 --- a/test/log/4710 +++ b/test/log/4710 @@ -1,6 +1,6 @@ -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4714 b/test/log/4714 index f97d89f6c..faeb68b5e 100644 --- a/test/log/4714 +++ b/test/log/4714 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r1_1.test.ex r1_2.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r2_1.test.ex r2_2.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r3_1.test.ex r3_2.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1234 -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => r1_1.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message 1 received" 1999-03-02 09:44:33 10HmaX-0005vi-00 => r1_2.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message 2 received" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed @@ -11,4 +11,4 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => r2_1.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message 5 received" 1999-03-02 09:44:33 10HmaY-0005vi-00 => r2_2.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message 6 received" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1234 -qq diff --git a/test/log/4804 b/test/log/4804 index 82356afb9..df10368f5 100644 --- a/test/log/4804 +++ b/test/log/4804 @@ -9,7 +9,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <nologging@l-sec.test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/5102 b/test/log/5102 index ea6a0bfb7..c1e9ea409 100644 --- a/test/log/5102 +++ b/test/log/5102 @@ -3,16 +3,16 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@myhost.test.ex R=smartuser T=lmtp defer (-1): LMTP timeout after initial connection -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@myhost.test.ex R=smartuser T=lmtp defer (-1): LMTP error after initial connection: 440 Sorry, there's a problem here -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@myhost.test.ex R=smartuser T=lmtp: LMTP error after MAIL FROM:<CALLER@myhost.test.ex>: 550 Don't like that sender 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@myhost.test.ex> R=bounces 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => lp1 <lp1@myhost.test.ex> R=smartuser T=lmtp C="250 Number 1 is OK" 1999-03-02 09:44:33 10HmbA-0005vi-00 == lp2@myhost.test.ex R=smartuser T=lmtp defer (-46): LMTP error after end of data: 450 Number 2 is now delayed diff --git a/test/log/5201 b/test/log/5201 index 0ff28306d..05eae70a2 100644 --- a/test/log/5201 +++ b/test/log/5201 @@ -1,8 +1,8 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 frozen by root -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 moved from input, msglog to Finput, Fmsglog -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen by the system filter 1999-03-02 09:44:33 10HmaY-0005vi-00 moved from input, msglog to Finput, Fmsglog diff --git a/test/log/5410 b/test/log/5410 index 37a049d20..3a8fee942 100644 --- a/test/log/5410 +++ b/test/log/5410 @@ -9,7 +9,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex diff --git a/test/log/5420 b/test/log/5420 index 37a049d20..3a8fee942 100644 --- a/test/log/5420 +++ b/test/log/5420 @@ -9,7 +9,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex diff --git a/test/log/5500 b/test/log/5500 index 08aad5aee..88855ae66 100644 --- a/test/log/5500 +++ b/test/log/5500 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 prdr_requested: <yes> 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<userx@test.ex> acceptance 1999-03-02 09:44:33 10HmaY-0005vi-00 PRDR R=<usery@test.ex> temporary refusal diff --git a/test/log/5590 b/test/log/5590 index def35fb66..c123ff11d 100644 --- a/test/log/5590 +++ b/test/log/5590 @@ -1,6 +1,6 @@ ******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 2017-07-30 18:51:05.712 10HmaX-0005vi-00 PRDR R=<bad1@test.ex> refusal 2017-07-30 18:51:05.712 10HmaX-0005vi-00 PRDR R=<good@test.ex> acceptance 2017-07-30 18:51:05.712 10HmaX-0005vi-00 PRDR R=<bad2@test.ex> refusal diff --git a/test/log/5600 b/test/log/5600 index 0e2b49b0b..0bcc82904 100644 --- a/test/log/5600 +++ b/test/log/5600 @@ -1,11 +1,11 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) diff --git a/test/log/5601 b/test/log/5601 index 2f3bf7b8c..066c1744e 100644 --- a/test/log/5601 +++ b/test/log/5601 @@ -18,12 +18,12 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 client claims: ocsp status 1 (notresp) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com for norequire@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 client claims: ocsp status 0 (notreq) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com for nostaple@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <nostaple@test.ex> R=server @@ -32,9 +32,9 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com for CALLER@test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> diff --git a/test/log/5610 b/test/log/5610 index 0e2b49b0b..0bcc82904 100644 --- a/test/log/5610 +++ b/test/log/5610 @@ -1,11 +1,11 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) diff --git a/test/log/5611 b/test/log/5611 index c590fb6db..0c385ca7c 100644 --- a/test/log/5611 +++ b/test/log/5611 @@ -18,12 +18,12 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 client claims: ocsp status 1 (notresp) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 client claims: ocsp status 0 (notreq) 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <nostaple@test.ex> R=server @@ -32,9 +32,9 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbA-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> diff --git a/test/log/5612 b/test/log/5612 index 95a283edd..166907dcd 100644 --- a/test/log/5612 +++ b/test/log/5612 @@ -8,9 +8,9 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com diff --git a/test/log/5615 b/test/log/5615 index 314fd91d8..8f33c8f95 100644 --- a/test/log/5615 +++ b/test/log/5615 @@ -8,9 +8,9 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com diff --git a/test/log/5650 b/test/log/5650 index 7f46ba122..74642cfbd 100644 --- a/test/log/5650 +++ b/test/log/5650 @@ -4,14 +4,14 @@ 1999-03-02 09:44:33 4: Connection functions when server is prepared to staple but client does not request it ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) 1999-03-02 09:44:33 acl_mail: ocsp in status: 1 (notresp) -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_certificate_set_ocsp_status_request_file2): The session or certificate has expired. -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_certificate_set_ocsp_status_request_file2): The session or certificate has expired. -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_conn: ocsp in status: 0 (notreq) diff --git a/test/log/5651 b/test/log/5651 index af1de34ed..334f07292 100644 --- a/test/log/5651 +++ b/test/log/5651 @@ -15,12 +15,12 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (certificate verification failed): certificate invalid ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 client claims: OCSP status 3 (failed) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbB-0005vi-00 client claims: OCSP status 0 (notreq) 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <nostaple@test.ex> R=server @@ -29,9 +29,9 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbA-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated. -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad diff --git a/test/log/5665 b/test/log/5665 index cf31aa340..eaaa30282 100644 --- a/test/log/5665 +++ b/test/log/5665 @@ -8,9 +8,9 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com diff --git a/test/log/5670 b/test/log/5670 index 9936c8592..fa5b052ff 100644 --- a/test/log/5670 +++ b/test/log/5670 @@ -14,11 +14,11 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 acl_mail: ocsp in status: 1 (notresp) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): The TLS connection was non-properly terminated. diff --git a/test/log/5700 b/test/log/5700 index 6bf83896c..ef6c70e8e 100644 --- a/test/log/5700 +++ b/test/log/5700 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaY-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:connect @@ -16,9 +16,9 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmaY-0005vi-00 . finished: 10HmaY-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect @@ -36,7 +36,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmaX-0005vi-00 . finished: 10HmaX-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1235 -qqf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaZ-0005vi-00 . [127.0.0.1]:1111 @@ -59,7 +59,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmaZ-0005vi-00 . finished: 10HmaZ-0005vi-00 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qqf 1999-03-02 09:44:33 10HmbA-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmbA-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmbA-0005vi-00 event smtp:connect @@ -81,9 +81,9 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbA-0005vi-00 . finished: 10HmbA-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1236 -qqf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1237 -qqf 1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmbB-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:connect @@ -101,9 +101,9 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbB-0005vi-00 . finished: 10HmbB-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1237 -qqf 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1238 -qqf 1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmbC-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect @@ -125,7 +125,7 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbC-0005vi-00 . finished: 10HmbC-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1238 -qqf 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbD-0005vi-00 cancelled by CALLER 1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:fail:internal diff --git a/test/log/5702 b/test/log/5702 index 5d494eee0..df9621ac9 100644 --- a/test/log/5702 +++ b/test/log/5702 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect @@ -20,4 +20,4 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmaX-0005vi-00 . finished: 10HmaX-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf diff --git a/test/log/5703 b/test/log/5703 index 1eb5e3505..b5578459b 100644 --- a/test/log/5703 +++ b/test/log/5703 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qqf 1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1]:1111 1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect @@ -34,4 +34,4 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmaX-0005vi-00 . finished: 10HmaX-0005vi-00 -1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 End queue run: pid=p1234 -qqf diff --git a/test/log/5710 b/test/log/5710 index 946bcbfe5..291dbae26 100644 --- a/test/log/5710 +++ b/test/log/5710 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP 1999-03-02 09:44:33 10HmaX-0005vi-00 cipher_ 1999-03-02 09:44:33 10HmaX-0005vi-00 ver: @@ -57,10 +57,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename2.server1.example.com:server1.example.com:alternatename.server1.example.com:*.test.ex> 1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename2.server1.example.com:server1.example.com:alternatename.server1.example.com:*.test.ex> 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 [127.0.0.1] depth=0 CN=server2.example.com 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/5711 b/test/log/5711 index 0616b56b2..32556a618 100644 --- a/test/log/5711 +++ b/test/log/5711 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 eval host_reject_connection 1999-03-02 09:44:33 ACL conn 1999-03-02 09:44:33 ACL quit diff --git a/test/log/5720 b/test/log/5720 index b959d23e0..a3d144e76 100644 --- a/test/log/5720 +++ b/test/log/5720 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP 1999-03-02 09:44:33 10HmaX-0005vi-00 cipher_ 1999-03-02 09:44:33 10HmaX-0005vi-00 ver: @@ -59,10 +59,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <*.test.ex:alternatename.server1.example.com:server1.example.com:alternatename2.server1.example.com> 1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <*.test.ex:alternatename.server1.example.com:server1.example.com:alternatename2.server1.example.com> 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 [127.0.0.1] depth=2 CN=clica CA rsa,O=example.com diff --git a/test/log/5721 b/test/log/5721 index bf826cef4..a1c9f9e37 100644 --- a/test/log/5721 +++ b/test/log/5721 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 eval host_reject_connection 1999-03-02 09:44:33 ACL conn 1999-03-02 09:44:33 ACL quit diff --git a/test/log/5730 b/test/log/5730 index 732ed954e..0fc2a8411 100644 --- a/test/log/5730 +++ b/test/log/5730 @@ -25,12 +25,12 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (certificate verification failed): certificate invalid ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 client claims: OCSP status 3 (failed) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 client claims: OCSP status 4 (verified) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <norequire@test.ex> R=server @@ -43,9 +43,9 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <good@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated. -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad diff --git a/test/log/5740 b/test/log/5740 index 61f9fdac2..88e4a46bb 100644 --- a/test/log/5740 +++ b/test/log/5740 @@ -28,12 +28,12 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 client claims: ocsp status 1 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com for norequire_1@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire_1@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbA-0005vi-00 client claims: ocsp status 4 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com for norequire_2@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <norequire_2@test.ex> R=server @@ -46,9 +46,9 @@ 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@server1.example.com for good@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <good@test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from (helo.data.changed) [127.0.0.1] (SSL_accept): error: <<detail omitted>> diff --git a/test/log/5801 b/test/log/5801 index 0400dd678..a9f35b878 100644 --- a/test/log/5801 +++ b/test/log/5801 @@ -7,71 +7,71 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t10@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t11@mxdane512ee1.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmbC-0005vi-00 => t10@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 => t11@mxdane512ee1.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t20@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t21@mxdane512ee1.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmbG-0005vi-00 => t20@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed 1999-03-02 09:44:33 10HmbH-0005vi-00 => t21@mxdane512ee1.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbJ-0005vi-00" 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1235 -qq 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t30@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t31@mxnondane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1236 1999-03-02 09:44:33 10HmbK-0005vi-00 => t30@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbM-0005vi-00" 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed 1999-03-02 09:44:33 10HmbL-0005vi-00 => t31@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbN-0005vi-00" 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1236 1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t40@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t41@mxnondane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1237 -qq 1999-03-02 09:44:33 10HmbO-0005vi-00 => t40@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbQ-0005vi-00" 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed 1999-03-02 09:44:33 10HmbP-0005vi-00 => t41@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbR-0005vi-00" 1999-03-02 09:44:33 10HmbP-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1237 -qq 1999-03-02 09:44:33 10HmbS-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t50@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmbT-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t51@mxnondane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1238 1999-03-02 09:44:33 10HmbS-0005vi-00 => t50@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbU-0005vi-00" 1999-03-02 09:44:33 10HmbS-0005vi-00 Completed 1999-03-02 09:44:33 10HmbT-0005vi-00 => t51@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbV-0005vi-00" 1999-03-02 09:44:33 10HmbT-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1238 1999-03-02 09:44:33 10HmbW-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t60@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmbX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t61@mxnondane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1239 -qq 1999-03-02 09:44:33 10HmbW-0005vi-00 => t60@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbY-0005vi-00" 1999-03-02 09:44:33 10HmbW-0005vi-00 Completed 1999-03-02 09:44:33 10HmbX-0005vi-00 => t61@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbZ-0005vi-00" 1999-03-02 09:44:33 10HmbX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1239 -qq 1999-03-02 09:44:33 10HmcA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t70@mxnondane512ee.test.ex 1999-03-02 09:44:33 10HmcB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t71@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1240 -qq 1999-03-02 09:44:33 10HmcA-0005vi-00 => t70@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmcC-0005vi-00" 1999-03-02 09:44:33 10HmcA-0005vi-00 Completed 1999-03-02 09:44:33 10HmcB-0005vi-00 => t71@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmcD-0005vi-00" 1999-03-02 09:44:33 10HmcB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1240 -qq 1999-03-02 09:44:33 10HmcE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t80@mxnondane512ee.test.ex 1999-03-02 09:44:33 10HmcF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t91@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 Start queue run: pid=p1241 -qq 1999-03-02 09:44:33 10HmcE-0005vi-00 => t80@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmcG-0005vi-00" 1999-03-02 09:44:33 10HmcE-0005vi-00 Completed 1999-03-02 09:44:33 10HmcF-0005vi-00 => t91@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmcH-0005vi-00" 1999-03-02 09:44:33 10HmcF-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 End queue run: pid=p1241 -qq ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1242, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane512ee.test.ex S=sss id=E10HmaX-0005vi-00@myhost.test.ex for t@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <t@mxdane512ee.test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/5802 b/test/log/5802 index f9e40379c..75b37aa54 100644 --- a/test/log/5802 +++ b/test/log/5802 @@ -36,7 +36,7 @@ 1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane512ee.test.ex S=sss id=E10HmaX-0005vi-00@myhost.test.ex for t0@mxdane512ee.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <t0@mxdane512ee.test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/5820 b/test/log/5820 index ecdca302c..2c1effb61 100644 --- a/test/log/5820 +++ b/test/log/5820 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t1@dane256ee.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t2@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => t1@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="CN=server1.example.com" C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => t2@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t4@mxdane256ta.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 => t4@mxdane256ta.test.ex R=client T=send_to_server H=dane256ta.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed @@ -15,15 +15,15 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t7@thishost.test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 => t7@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbG-0005vi-00" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t8@mxdanelazy.test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t9@dane.no.1.test.ex 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t10@dane.no.2.test.ex 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t11@danebroken1.test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t12@dane.no.3.test.ex 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t13@dane.no.4.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbH-0005vi-00 H=danelazy.test.ex [ip4.ip4.ip4.ip4]: DANE error: tlsa lookup DEFER 1999-03-02 09:44:33 10HmbH-0005vi-00 H=danelazy2.test.ex [127.0.0.1]: DANE error: tlsa lookup DEFER 1999-03-02 09:44:33 10HmbH-0005vi-00 == t8@mxdanelazy.test.ex R=client T=send_to_server defer (-36): DANE error: tlsa lookup DEFER @@ -39,7 +39,7 @@ 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed 1999-03-02 09:44:33 10HmbM-0005vi-00 => t13@dane.no.4.test.ex R=client T=send_to_server H=dane.no.4.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=server1.example.com" C="250 OK id=10HmbO-0005vi-00" 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbH-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed 1999-03-02 09:44:33 10HmbK-0005vi-00 removed by CALLER @@ -79,7 +79,7 @@ 1999-03-02 09:44:33 10HmbP-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane256ee.test.ex S=sss id=E10HmaX-0005vi-00@myhost.test.ex for t1@dane256ee.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <t1@dane256ee.test.ex> R=server @@ -89,22 +89,22 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <t2@mxdane512ee.test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 "rcpt ACL" -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane256ta.test.ex S=sss id=E10HmbB-0005vi-00@myhost.test.ex for t4@mxdane256ta.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <t4@mxdane256ta.test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for t6@thishost.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <t6@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for t7@thishost.test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <t7@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex for t10@dane.no.2.test.ex 1999-03-02 09:44:33 10HmbN-0005vi-00 => :blackhole: <t10@dane.no.2.test.ex> R=server @@ -126,13 +126,13 @@ 1999-03-02 09:44:33 10HmbX-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=danemixed.test.ex S=sss id=E10HmbW-0005vi-00@myhost.test.ex for t18a@danemixed.test.ex 1999-03-02 09:44:33 10HmbX-0005vi-00 => :blackhole: <t18a@danemixed.test.ex> R=server 1999-03-02 09:44:33 10HmbX-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1242, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmcA-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=danebroken8.example.com S=sss id=E10HmbZ-0005vi-00@myhost.test.ex for t20@danebroken8.example.com 1999-03-02 09:44:33 10HmcA-0005vi-00 => :blackhole: <t20@danebroken8.example.com> R=server 1999-03-02 09:44:33 10HmcA-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1243, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmcC-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmcB-0005vi-00@myhost.test.ex for t21@danebroken2.test.ex 1999-03-02 09:44:33 10HmcC-0005vi-00 => :blackhole: <t21@danebroken2.test.ex> R=server diff --git a/test/log/5821 b/test/log/5821 index f2266e77e..67ee289fa 100644 --- a/test/log/5821 +++ b/test/log/5821 @@ -12,7 +12,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL: tls_in_bits 128" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@localhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@localhost.test.ex> R=server diff --git a/test/log/5840 b/test/log/5840 index f3caf5e03..94f945434 100644 --- a/test/log/5840 +++ b/test/log/5840 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t1@dane256ee.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t2@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => t1@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="/CN=server1.example.com" C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaY-0005vi-00 => t2@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t4@mxdane256ta.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 => t4@mxdane256ta.test.ex R=client T=send_to_server H=dane256ta.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed @@ -18,15 +18,15 @@ 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t7@thishost.test.ex 1999-03-02 09:44:33 10HmbH-0005vi-00 => t7@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbI-0005vi-00" 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t8@mxdanelazy.test.ex 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t9@dane.no.1.test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t10@dane.no.2.test.ex 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t11@danebroken1.test.ex 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t12@dane.no.3.test.ex 1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t13@dane.no.4.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 H=danelazy.test.ex [ip4.ip4.ip4.ip4]: DANE error: tlsa lookup DEFER 1999-03-02 09:44:33 10HmbJ-0005vi-00 H=danelazy2.test.ex [127.0.0.1]: DANE error: tlsa lookup DEFER 1999-03-02 09:44:33 10HmbJ-0005vi-00 == t8@mxdanelazy.test.ex R=client T=send_to_server defer (-36): DANE error: tlsa lookup DEFER @@ -42,7 +42,7 @@ 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed 1999-03-02 09:44:33 10HmbO-0005vi-00 => t13@dane.no.4.test.ex R=client T=send_to_server H=dane.no.4.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbQ-0005vi-00" 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1236 -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbM-0005vi-00 removed by CALLER @@ -79,7 +79,7 @@ 1999-03-02 09:44:33 10HmbR-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane256ee.test.ex S=sss id=E10HmaX-0005vi-00@myhost.test.ex for t1@dane256ee.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <t1@dane256ee.test.ex> R=server @@ -89,27 +89,27 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <t2@mxdane512ee.test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 "rcpt ACL" -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane256ta.test.ex S=sss id=E10HmbB-0005vi-00@myhost.test.ex for t4@mxdane256ta.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <t4@mxdane256ta.test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=dane256tak.test.ex S=sss id=E10HmbD-0005vi-00@myhost.test.ex for t5@mxdane256tak.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <t5@mxdane256tak.test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for t6@thishost.test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <t6@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbH-0005vi-00@myhost.test.ex for t7@thishost.test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <t7@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1242, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbP-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for t10@dane.no.2.test.ex 1999-03-02 09:44:33 10HmbP-0005vi-00 => :blackhole: <t10@dane.no.2.test.ex> R=server @@ -127,13 +127,13 @@ 1999-03-02 09:44:33 10HmbW-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbV-0005vi-00@myhost.test.ex for t17@danebroken5.test.ex 1999-03-02 09:44:33 10HmbW-0005vi-00 => :blackhole: <t17@danebroken5.test.ex> R=server 1999-03-02 09:44:33 10HmbW-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1243, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmcA-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=danebroken8.example.com S=sss id=E10HmbZ-0005vi-00@myhost.test.ex for t20@danebroken8.example.com 1999-03-02 09:44:33 10HmcA-0005vi-00 => :blackhole: <t20@danebroken8.example.com> R=server 1999-03-02 09:44:33 10HmcA-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1244, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmcC-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmcB-0005vi-00@myhost.test.ex for t21@danebroken2.test.ex 1999-03-02 09:44:33 10HmcC-0005vi-00 => :blackhole: <t21@danebroken2.test.ex> R=server diff --git a/test/log/5841 b/test/log/5841 index 63be2a5be..43ca14628 100644 --- a/test/log/5841 +++ b/test/log/5841 @@ -12,7 +12,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@localhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@localhost.test.ex> R=server diff --git a/test/log/5860 b/test/log/5860 index 14e2f4bb7..658ca2c9b 100644 --- a/test/log/5860 +++ b/test/log/5860 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@dane256ee.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 tls:cert depth = 0 <CN=server1.example.com> 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="/CN=server1.example.com" C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 msg:delivery dane=yes @@ -9,30 +9,30 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 msg:delivery dane=yes 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane256ta.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 2 <CN=clica CA rsa,O=example.com> 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 1 <CN=clica Signing Cert rsa,O=example.com> 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 0 <CN=server1.example.com> 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@mxdane256ta.test.ex R=client T=send_to_server H=dane256ta.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 msg:delivery dane=yes 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for CALLER@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@dane256ee.test.ex> R=server 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@mxdane512ee.test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1237 -qf +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@myhost.test.ex for CALLER@mxdane256ta.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1239 -qf 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@mxdane256ta.test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1239 -qf diff --git a/test/log/5861 b/test/log/5861 index 3af3971c8..03bf02a15 100644 --- a/test/log/5861 +++ b/test/log/5861 @@ -5,8 +5,8 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@thishost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdanelazy.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 dane:fail <dane-required> 1999-03-02 09:44:33 10HmbB-0005vi-00 H=danelazy.test.ex [ip4.ip4.ip4.ip4]: DANE error: tlsa lookup DEFER @@ -66,17 +66,17 @@ 1999-03-02 09:44:33 10HmbR-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for CALLER@dane.no.2.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <CALLER@dane.no.2.test.ex> R=server @@ -94,7 +94,7 @@ 1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbN-0005vi-00@myhost.test.ex for CALLER@danebroken5.test.ex 1999-03-02 09:44:33 10HmbO-0005vi-00 => :blackhole: <CALLER@danebroken5.test.ex> R=server 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost (myhost.test.ex) [127.0.0.1] (SSL_accept): error: <<detail omitted>> 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbS-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbR-0005vi-00@myhost.test.ex for CALLER@danebroken8.example.com diff --git a/test/log/5880 b/test/log/5880 index 5c8f49345..d3053c91d 100644 --- a/test/log/5880 +++ b/test/log/5880 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@dane256ee.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 tls:cert depth = 2 <O=example.com,CN=clica CA rsa> 1999-03-02 09:44:33 10HmaX-0005vi-00 tls:cert depth = 1 <O=example.com,CN=clica Signing Cert rsa> 1999-03-02 09:44:33 10HmaX-0005vi-00 tls:cert depth = 0 <CN=server1.example.com> @@ -13,30 +13,30 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 msg:delivery dane=yes 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane256ta.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1235 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 2 <O=example.com,CN=clica CA rsa> 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 1 <O=example.com,CN=clica Signing Cert rsa> 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 0 <CN=server1.example.com> 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@mxdane256ta.test.ex R=client T=send_to_server H=dane256ta.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 msg:delivery dane=yes 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1235 -qf ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for CALLER@mxdane512ee.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1237 -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@dane256ee.test.ex> R=server 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@mxdane512ee.test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 End queue run: pid=p1237 -qf +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@myhost.test.ex for CALLER@mxdane256ta.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1239 -qf 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@mxdane256ta.test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 End queue run: pid=p1239 -qf diff --git a/test/log/5881 b/test/log/5881 index 8febcc1b1..ee121666f 100644 --- a/test/log/5881 +++ b/test/log/5881 @@ -4,8 +4,8 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@thishost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 Start queue run: pid=p1234 -qf +1999-03-02 09:44:33 End queue run: pid=p1234 -qf 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdanelazy.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 dane:fail <dane-required> 1999-03-02 09:44:33 10HmbB-0005vi-00 H=danelazy.test.ex [ip4.ip4.ip4.ip4]: DANE error: tlsa lookup DEFER @@ -63,17 +63,17 @@ 1999-03-02 09:44:33 10HmbR-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@thishost.test.ex> R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for CALLER@dane.no.2.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <CALLER@dane.no.2.test.ex> R=server @@ -91,7 +91,7 @@ 1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbN-0005vi-00@myhost.test.ex for CALLER@danebroken5.test.ex 1999-03-02 09:44:33 10HmbO-0005vi-00 => :blackhole: <CALLER@danebroken5.test.ex> R=server 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): A TLS fatal alert has been received: Certificate is bad 1999-03-02 09:44:33 "rcpt ACL" 1999-03-02 09:44:33 10HmbS-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbR-0005vi-00@myhost.test.ex for CALLER@danebroken8.example.com diff --git a/test/log/5890 b/test/log/5890 index 97f779835..73fcfed50 100644 --- a/test/log/5890 +++ b/test/log/5890 @@ -198,7 +198,7 @@ 1999-03-02 09:44:33 10HmcH-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject diff --git a/test/log/5891 b/test/log/5891 index b33d5d27d..eca7c9249 100644 --- a/test/log/5891 +++ b/test/log/5891 @@ -174,7 +174,7 @@ 1999-03-02 09:44:33 10HmbZ-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client offered session, server only provided new ticket 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject @@ -275,7 +275,7 @@ 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke--AES256-SHAnnn:xxx* CV=no S=sss id=E10HmbM-0005vi-00@myhost.test.ex for noverify_resume@test.ex 1999-03-02 09:44:33 10HmbN-0005vi-00 => :blackhole: <noverify_resume@test.ex> R=server 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject diff --git a/test/log/5892 b/test/log/5892 index 58e9e6e6c..ce8b0ea7d 100644 --- a/test/log/5892 +++ b/test/log/5892 @@ -130,7 +130,7 @@ 1999-03-02 09:44:33 10HmbU-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject diff --git a/test/log/5893 b/test/log/5893 index 8c535f72f..3aceeea78 100644 --- a/test/log/5893 +++ b/test/log/5893 @@ -99,7 +99,7 @@ 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject diff --git a/test/log/5894 b/test/log/5894 index 429c34568..93bb2f4f4 100644 --- a/test/log/5894 +++ b/test/log/5894 @@ -69,7 +69,7 @@ 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject diff --git a/test/log/5895 b/test/log/5895 index fa15df27f..9957b3e44 100644 --- a/test/log/5895 +++ b/test/log/5895 @@ -76,7 +76,7 @@ 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed ******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 tls_in_resumption client requested new ticket, server provided 1999-03-02 09:44:33 our cert subject CN=server1.example.com 1999-03-02 09:44:33 peer cert subject diff --git a/test/log/5902 b/test/log/5902 index 6642e4f68..428027437 100644 --- a/test/log/5902 +++ b/test/log/5902 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => user1 <user1@test.ex> R=scan T=scan 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 10HmaX-0005vi-00 => user1 <user1@test.ex> R=local T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 End queue run: pid=p1234 diff --git a/test/runtest b/test/runtest index d760a0090..8200a2cd6 100755 --- a/test/runtest +++ b/test/runtest @@ -747,7 +747,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/\bgid=\d+/gid=gggg/; s/\begid=\d+/egid=gggg/; - s/\b(pid=|pid |PID: )\d+/$1pppp/; + s/\b(?:pid=|pid\s|PID:\s|Process\s|child\s)\K(\d+)/new_value($1, "p%s", \$next_pid)/gxe; s/\buid=\d+/uid=uuuu/; s/\beuid=\d+/euid=uuuu/; s/set_process_info:\s+\d+/set_process_info: pppp/; @@ -1053,14 +1053,35 @@ RESET_AFTER_EXTRA_LINE_READ: elsif ($is_stderr) { # The very first line of debugging output will vary - s/^Exim version .*/Exim version x.yz ..../; + # Skip some lines that Exim puts out at the start of debugging output + # because they will be different in different binaries. + + next if /^$time_pid? + (?: Berkeley\ DB:\s + | Probably\ (?:Berkeley\ DB|ndbm|GDBM) + | Using\ tdb + | Authenticators: + | Lookups(?:\(built-in\))?: + | Support\ for: + | Routers: + | Transports: + | Malware: + | log\ selectors\ = + | cwd= + | Fixed\ never_users + | Configure\ owner + | Size\ of\ off_t: + ) + /x; + + # Lines with a leading pid + s/^(\d+)\s(?!(?:previous message|in\s))/new_value($1, "p%s", \$next_pid) . ' '/e; + # Debugging lines for Exim terminations and process-generation - s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/; - s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/; - s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/; + s/^\s*\K(\d+)(?=\sexec\s.*\s-oPX$)/new_value($1, "%s", \$next_pid)/xe; next if /(?:postfork: | fork(?:ing|ed) for )/; # IP address lookups use gethostbyname() when IPv6 is not supported, @@ -1372,7 +1393,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/Address family not supported by protocol family/Network Error/; s/Network is unreachable/Network Error/; } - next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/; + next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/; s/^(Connecting to .* \.\.\. sending) \d+ (nonTFO early-data)$/$1 dd $2/; if (/^([0-9: ]* # possible timestamp @@ -1432,8 +1453,8 @@ RESET_AFTER_EXTRA_LINE_READ: s/^\d\d:\d\d:\d\d\s+/01:01:01 /mg; # pid in debug lines - s/^(\d\d:\d\d:\d\d)(\s+\d+\s)/"$1 " . new_value($2, "%s", \$next_pid) . " "/mgxe; - s/(?<!post-)[Pp]rocess\K(\s\d+ )/new_value($1, "%s", \$next_pid) . " "/gxe; + s/^(\d\d:\d\d:\d\d\s+)(\d+)/$1 . new_value($2, "p%s", \$next_pid) . " "/mgxe; + s/(?<!post-)[Pp]rocess\K(\s\d+ )/new_value($1, "p%s", \$next_pid) . " "/gxe; # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order @@ -1456,27 +1477,6 @@ RESET_AFTER_EXTRA_LINE_READ: @saved = (); } - # Skip some lines that Exim puts out at the start of debugging output - # because they will be different in different binaries. - - next if /^$time_pid? - (?: Berkeley\ DB:\s - | Probably\ (?:Berkeley\ DB|ndbm|GDBM) - | Using\ tdb - | Authenticators: - | Lookups(?:\(built-in\))?: - | Support\ for: - | Routers: - | Transports: - | Malware: - | log\ selectors\ = - | cwd= - | Fixed\ never_users - | Configure\ owner - | Size\ of\ off_t: - ) - /x; - print MUNGED; } @@ -1918,9 +1918,6 @@ $munges = 'rejectlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /', }, - 'debug_pid' => - { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d+/ppppp/g' }, - 'optional_dsn_info' => { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/' }, diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609 index 79f214ba8..bda2631f5 100644 --- a/test/scripts/0000-Basic/0609 +++ b/test/scripts/0000-Basic/0609 @@ -1,5 +1,4 @@ # Long ACL delay, truncated -munge debug_pid need_ipv4 # # We want the debug note of a truncated delay diff --git a/test/scripts/2200-dnsdb/2201 b/test/scripts/2200-dnsdb/2201 index c4dfcfb1b..7fdfda9d5 100644 --- a/test/scripts/2200-dnsdb/2201 +++ b/test/scripts/2200-dnsdb/2201 @@ -1,6 +1,5 @@ # query-style lookup in domains, local_parts, senders need_ipv4 -munge debug_pid exim -d -bt test.ex@test.ex unknown@test.ex **** 2 diff --git a/test/stderr/0002 b/test/stderr/0002 index 7b9241b99..8f6bf8720 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -128,7 +128,7 @@ LOG: MAIN PANIC ├───item-res: no ├──expanding: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}} ╰─────result: match_address: no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -253,7 +253,7 @@ LOG: MAIN PANIC |---item-res: no |--expanding: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}} \_____result: match_address: no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -310,7 +310,7 @@ dropping to exim gid; retaining priv uid ├──expanding: -oMt sender_ident = $sender_ident ╰─────result: -oMt sender_ident = me ╰──(tainted) ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13 Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -409,14 +409,14 @@ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me) ├──expanding: -oMt sender_ident = $sender_ident ╰─────result: -oMt sender_ident = me ╰──(tainted) ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.0.0.1] @@ -469,14 +469,14 @@ SMTP>> 550 Administrative prohibition LOG: connection_reject MAIN REJECT H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1239 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.0.0.2] @@ -514,7 +514,7 @@ SMTP>> 550 Administrative prohibition LOG: connection_reject MAIN REJECT H=[V4NET.0.0.2] rejected connection in "connect" ACL search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -660,7 +660,7 @@ LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be enc LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1240 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -669,4 +669,4 @@ sender address = CALLER@myhost.test.ex 1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask) 1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask) search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0021 b/test/stderr/0021 index 1b1f6a605..c330bc449 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -106,7 +106,7 @@ accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> 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 .... configuration file is TESTSUITE/test-config @@ -201,10 +201,10 @@ LOG: MAIN => x <x@y> R=accept T=appendfile LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> 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 1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers diff --git a/test/stderr/0022 b/test/stderr/0022 index d0ab9c00e..91f600d46 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -71,14 +71,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -148,14 +148,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -226,7 +226,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) diff --git a/test/stderr/0037 b/test/stderr/0037 index 35555aa70..1f91e3d18 100644 --- a/test/stderr/0037 +++ b/test/stderr/0037 @@ -45,7 +45,7 @@ ssss bytes read from TESTSUITE/aux-var/0037.f-user data is an Exim filter program Filter: start of processing Filter: end of processing ->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> rda_interpret: subprocess yield=0 error=NULL userfilter router generated userx@test.ex errors_to=NULL transport=NULL @@ -106,5 +106,5 @@ LOG: MAIN => userx <filter-userx@test.ex> R=user_accept2 T=appendfile LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0044 b/test/stderr/0044 index e8e4a384f..7aa38d84b 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -146,7 +146,7 @@ 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 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -178,11 +178,11 @@ search_tidyup called LOG: 10HmaY-0005vi-00 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -278,4 +278,4 @@ SMTP>> 421 the.local.host.name lost input connection LOG: lost_incoming_connection MAIN unexpected disconnection while reading SMTP command from (exim.test.ex) [V4NET.99.99.99] D=qqs search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0055 b/test/stderr/0055 index 71884fec7..060d5626d 100644 --- a/test/stderr/0055 +++ b/test/stderr/0055 @@ -30,30 +30,30 @@ delivering 10HmbC-0005vi-00 LOG: MAIN == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue LOG: queue_run MAIN - Start queue run: pid=pppp -delivering 10HmbC-0005vi-00 (queue run pid pppp) + Start queue run: pid=p1236 +delivering 10HmbC-0005vi-00 (queue run pid p1236) LOG: MAIN *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" LOG: MAIN Completed LOG: queue_run MAIN - End queue run: pid=pppp + End queue run: pid=p1236 LOG: queue_run MAIN - Start queue run: pid=pppp -qq -delivering 10HmbD-0005vi-00 (queue run pid pppp) -delivering 10HmbE-0005vi-00 (queue run pid pppp) -delivering 10HmbD-0005vi-00 (queue run pid pppp) + Start queue run: pid=p1237 -qq +delivering 10HmbD-0005vi-00 (queue run pid p1237) +delivering 10HmbE-0005vi-00 (queue run pid p1237) +delivering 10HmbD-0005vi-00 (queue run pid p1237) LOG: MAIN *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN Completed -delivering 10HmbE-0005vi-00 (queue run pid pppp) +delivering 10HmbE-0005vi-00 (queue run pid p1237) LOG: MAIN *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN Completed LOG: queue_run MAIN - End queue run: pid=pppp -qq + End queue run: pid=p1237 -qq LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss delivering 10HmbF-0005vi-00 diff --git a/test/stderr/0078 b/test/stderr/0078 index b5a3a88eb..58266f252 100644 --- a/test/stderr/0078 +++ b/test/stderr/0078 @@ -19,7 +19,7 @@ routed by lookuphost router envelope to: xx@mxt6.test.ex transport: remote_smtp host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -55,7 +55,7 @@ routed by self router envelope to: myhost.test.ex@mxt1.test.ex transport: remote_smtp host myhost.test.ex [V4NET.10.10.10] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -105,7 +105,7 @@ routed by self2 router envelope to: xx@mxt1.test.ex transport: remote_smtp host myhost.test.ex [V4NET.10.10.10] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -121,4 +121,4 @@ lookuphost router called for xx@not-exist.test.ex lookuphost router declined for xx@not-exist.test.ex "more" is false: skipping remaining routers no more routers ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0084 b/test/stderr/0084 index 7b93db7fb..d805f7a61 100644 --- a/test/stderr/0084 +++ b/test/stderr/0084 @@ -64,4 +64,4 @@ domain = myhost.test.ex routed by smart router envelope to: no@myhost.test.ex transport: <none> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0085 b/test/stderr/0085 index 0836b3e83..6659d3239 100644 --- a/test/stderr/0085 +++ b/test/stderr/0085 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -201,14 +201,14 @@ myhost.test.ex in "test.ex"? no (end of list) smart2 router skipped: domains mismatch no more routers search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -376,4 +376,4 @@ myhost.test.ex in "test.ex"? no (end of list) smart2 router skipped: domains mismatch no more routers search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0092 b/test/stderr/0092 index 6fa174dc3..306506e52 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -35,12 +35,12 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.0.0.1] @@ -132,7 +132,7 @@ LOG: lost_incoming_connection MAIN SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection. search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> exim: timed out while reading - message abandoned exim: timed out while reading - message abandoned >>> host in hosts_connection_nolog? no (option unset) diff --git a/test/stderr/0094 b/test/stderr/0094 index 86569ec94..bd40fc7e7 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -64,11 +64,11 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -159,4 +159,4 @@ 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 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0117 b/test/stderr/0117 index 40088993b..b5cde0daf 100644 --- a/test/stderr/0117 +++ b/test/stderr/0117 @@ -18,7 +18,7 @@ routed by lookuphost router host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -39,7 +39,7 @@ routed by lookuphost router host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -60,4 +60,4 @@ routed by lookuphost router host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0123 b/test/stderr/0123 index 347d9761b..d9f4557f5 100644 --- a/test/stderr/0123 +++ b/test/stderr/0123 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -450,4 +450,4 @@ parse_forward_list: c3 router declined for z@test.ex no more routers search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0143 b/test/stderr/0143 index f8c9624ce..e9abae9c2 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -61,5 +61,5 @@ LOG: MAIN => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0149 b/test/stderr/0149 index 6375a6cd4..b2ae45a25 100644 --- a/test/stderr/0149 +++ b/test/stderr/0149 @@ -184,4 +184,4 @@ routed by domainlist2 router transport: <none> host V4NET.0.0.6 [V4NET.0.0.6] host V4NET.0.0.7 [V4NET.0.0.7] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0161 b/test/stderr/0161 index 6a8449d8d..dad95576f 100644 --- a/test/stderr/0161 +++ b/test/stderr/0161 @@ -24,7 +24,7 @@ routed by lookuphost router envelope to: xx@mxt6.test.ex transport: remote_smtp host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -70,7 +70,7 @@ routed by self router envelope to: myhost.test.ex@mxt1.test.ex transport: remote_smtp host myhost.test.ex [V4NET.10.10.10] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -130,7 +130,7 @@ routed by self2 router envelope to: xx@mxt1.test.ex transport: remote_smtp host myhost.test.ex [V4NET.10.10.10] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -151,7 +151,7 @@ lookuphost router called for xx@not-exist.test.ex lookuphost router declined for xx@not-exist.test.ex "more" is false: skipping remaining routers no more routers ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -167,7 +167,7 @@ failuphost router called for ff@mxt1.test.ex domain = mxt1.test.ex lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail) failuphost router forced address failure ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -202,4 +202,4 @@ set transport remote_smtp finding IP address for fff calling host_find_byname fail router forced address failure ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0169 b/test/stderr/0169 index 0585da344..55fd2bcb0 100644 --- a/test/stderr/0169 +++ b/test/stderr/0169 @@ -37,5 +37,5 @@ LOG: MAIN => userx <userx@myhost.test.ex> R=localuser T=appendfile LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0183 b/test/stderr/0183 index 3ffdf28ea..2e2969aaa 100644 --- a/test/stderr/0183 +++ b/test/stderr/0183 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -207,10 +207,10 @@ routed by lookuphost router transport: smtp host ten-1.test.ex [V4NET.0.0.1] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -415,10 +415,10 @@ routed by lookuphost router transport: smtp host ten-1.test.ex [V4NET.0.0.1] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -627,10 +627,10 @@ routed by lookuphost router transport: smtp host ten-1.test.ex [V4NET.0.0.1] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -692,10 +692,10 @@ returning DNS_FAIL srv router: defer for srv@test.fail.dns message: host lookup did not complete search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -779,4 +779,4 @@ delay router declined for userd@nonexist.example.com "more" is false: skipping remaining routers no more routers search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0218 b/test/stderr/0218 index a048735a2..216734dd2 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -4,20 +4,20 @@ admin user dropping to exim gid; retaining priv uid Single queue run LOG: queue_run MAIN - Start queue run: pid=pppp -qq + Start queue run: pid=p1234 -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid pppp) +delivering 10HmaX-0005vi-00 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmaY-0005vi-00 (queue run pid pppp) +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmaY-0005vi-00 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid pppp) +delivering 10HmaX-0005vi-00 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -40,13 +40,13 @@ LOG: MAIN => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 (queue run pid pppp) +delivering 10HmaY-0005vi-00 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) SMTP|> MAIL FROM:<CALLER@test.ex> @@ -67,30 +67,30 @@ LOG: MAIN => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qq ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qq +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid Single queue run LOG: queue_run MAIN - Start queue run: pid=pppp -qq + Start queue run: pid=p1235 -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid pppp) +delivering 10HmaZ-0005vi-00 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid pppp) +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbA-0005vi-00 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid pppp) +delivering 10HmaZ-0005vi-00 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -117,11 +117,11 @@ trusted user admin user LOG: MAIN <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid pppp) +>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbA-0005vi-00 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused @@ -129,21 +129,21 @@ LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN == b@test.ex R=client T=send_to_server defer (dd): Connection refused ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qq ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 -qq +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qqf -delivering 10HmbA-0005vi-00 (queue run pid pppp) + Start queue run: pid=p1236 -qqf +delivering 10HmbA-0005vi-00 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbB-0005vi-00 (queue run pid pppp) +>>>>>>>>>>>>>>>> Exim pid=p1246 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbB-0005vi-00 (queue run pid p1236) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -151,12 +151,12 @@ LOG: MAIN CALLER@test.ex: error ignored LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbC-0005vi-00 (queue run pid pppp) +>>>>>>>>>>>>>>>> Exim pid=p1247 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbC-0005vi-00 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid pppp) +>>>>>>>>>>>>>>>> Exim pid=p1248 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +delivering 10HmbA-0005vi-00 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -182,16 +182,16 @@ trusted user admin user LOG: MAIN <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1249 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbC-0005vi-00 (queue run pid pppp) +delivering 10HmbC-0005vi-00 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) SMTP|> MAIL FROM:<CALLER@test.ex> @@ -212,7 +212,7 @@ LOG: MAIN => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1251 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1236 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0249 b/test/stderr/0249 index c130aa0a2..b3281d30c 100644 --- a/test/stderr/0249 +++ b/test/stderr/0249 @@ -17,4 +17,4 @@ LOG: address_rewrite MAIN "User@c.domain" from env-from rewritten as "User@d.domain" by rule 2 LOG: address_rewrite MAIN "User@c.domain" from env-to rewritten as "User@d.domain" by rule 2 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0264 b/test/stderr/0264 index 4f0c65ba7..5d7324c18 100644 --- a/test/stderr/0264 +++ b/test/stderr/0264 @@ -95,5 +95,5 @@ Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H end delivery of 10HmbJ-0005vi-00 ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0275 b/test/stderr/0275 index b14b6d911..72086add3 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -98,14 +98,14 @@ routed by r3 router envelope to: userx@test.ex transport: t1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -149,7 +149,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config trusted user admin user @@ -289,7 +289,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 appendfile transport entered @@ -308,7 +308,7 @@ LOG: MAIN => userx <userx@test.ex> R=r3 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -329,16 +329,16 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -399,4 +399,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [127.0.0.1] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0277 b/test/stderr/0277 index 9f606b932..a71c6c862 100644 --- a/test/stderr/0277 +++ b/test/stderr/0277 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.2.3.4] @@ -40,14 +40,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.6.7.8] @@ -75,14 +75,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.6.7.8] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.10.11.12] @@ -121,14 +121,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.10.11.12] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.1.1.1] @@ -167,14 +167,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.1.1.1] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.2.2.2] @@ -212,4 +212,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.2.2.2] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0278 b/test/stderr/0278 index bc36cfb03..7c2a7fe9a 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -57,14 +57,14 @@ routed by r3 router envelope to: CALLER@test.ex transport: t1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -108,7 +108,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config trusted user admin user @@ -203,7 +203,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=CALLER_HOME current=CALLER_HOME set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 appendfile transport entered @@ -222,7 +222,7 @@ LOG: MAIN => CALLER <CALLER@test.ex> R=r3 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -243,12 +243,12 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -331,4 +331,4 @@ unknown in "+local_localparts : +expanded : +unexpanded"? no (end of list) r5 router skipped: local_parts mismatch no more routers search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0279 b/test/stderr/0279 index d61b7fb8e..c3725806f 100644 --- a/test/stderr/0279 +++ b/test/stderr/0279 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -71,10 +71,10 @@ routed by r3 router envelope to: CALLER@test.ex transport: t1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -107,4 +107,4 @@ parse_forward_list: :fail: matched *@+funny_domains extract item: :fail: matched *@+funny_domains rr1 router forced address failure search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0283 b/test/stderr/0283 index 0b05aa339..8a8d45165 100644 --- a/test/stderr/0283 +++ b/test/stderr/0283 @@ -1,12 +1,12 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available @@ -16,7 +16,7 @@ LOG: MAIN created log directory TESTSUITE/spool/log Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg configuration file is TESTSUITE/test-config @@ -28,22 +28,22 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg changed uid/gid: local delivery to somebody <somebody@myhost.test.ex> transport=t1 - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 transport error EPIPE ignored LOG: MAIN ** somebody@myhost.test.ex R=rest T=t1: return message generated changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1237 seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available @@ -52,7 +52,7 @@ LOG: MAIN <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1238 seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg configuration file is TESTSUITE/test-config @@ -64,28 +64,28 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t2 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 LOG: MAIN => CALLER <CALLER@myhost.test.ex> R=caller T=t2 changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1240 seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1240 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available @@ -94,7 +94,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1241 seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg configuration file is TESTSUITE/test-config @@ -110,6 +110,6 @@ LOG: MAIN PANIC LOG: MAIN == never@myhost.test.ex R=never T=t3 defer (-29): User 0 set for t3 transport is on the never_users list changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + uid=EXIM_UID gid=EXIM_GID pid=p1241 +>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0294 b/test/stderr/0294 index 8bd1e8c9e..54e2330d3 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -94,7 +94,7 @@ SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -143,7 +143,7 @@ SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [1.2.3.4] closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -193,7 +193,7 @@ SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.9.8.7] closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -256,4 +256,4 @@ SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0297 b/test/stderr/0297 index 200f76ab4..183f92144 100644 --- a/test/stderr/0297 +++ b/test/stderr/0297 @@ -21,7 +21,7 @@ r1 router generated /a/b/c routed by r1 router envelope to: /a/b/c@myhost.test.ex transport: <none> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -45,7 +45,7 @@ r1 router generated /x/y/z routed by r1 router envelope to: /x/y/z@myhost.test.ex transport: <none> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN <= fil@ter U=CALLER P=local S=sss delivering 10HmaX-0005vi-00 diff --git a/test/stderr/0303 b/test/stderr/0303 index bf8f94662..cbfaf2afe 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -38,14 +38,14 @@ >>> rhubarb.custard in helo_lookup_domains? no (end of list) Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [V4NET.2.3.4] @@ -113,17 +113,17 @@ 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 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = host.name.tld [V4NET.2.3.4] @@ -190,4 +190,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0315 b/test/stderr/0315 index 9ff377e8b..7b4103034 100644 --- a/test/stderr/0315 +++ b/test/stderr/0315 @@ -55,8 +55,8 @@ LOG: MAIN *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -132,5 +132,5 @@ LOG: MAIN *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0317 b/test/stderr/0317 index 85ee2740a..660a39d28 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -32,7 +32,7 @@ Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -72,4 +72,4 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0332 b/test/stderr/0332 index 4ca67a51c..11f0429dc 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -3,7 +3,7 @@ configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ok@no.delay @@ -39,7 +39,7 @@ LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -84,7 +84,7 @@ locking TESTSUITE/spool/db/wait-t1.lockfile cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250' LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: delay@test.again.dns @@ -98,7 +98,7 @@ After routing: Failed addresses: Deferred addresses: delay@test.again.dns ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0333 b/test/stderr/0333 index 1acaa1f9e..422ed67bb 100644 --- a/test/stderr/0333 +++ b/test/stderr/0333 @@ -37,7 +37,7 @@ LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -82,4 +82,4 @@ locking TESTSUITE/spool/db/wait-t1.lockfile cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250' LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0357 b/test/stderr/0357 index 6881590d6..609b32612 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -43,14 +43,14 @@ Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -99,16 +99,16 @@ Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1235 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -157,16 +157,16 @@ Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+4 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1236 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -190,7 +190,7 @@ Failed addresses: Deferred addresses: userx@test.ex: no retry items end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1236 +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0358 b/test/stderr/0358 index abc5f64c3..6e1e2bd1f 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -59,14 +59,14 @@ Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -145,7 +145,7 @@ Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+4 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0360 b/test/stderr/0360 index e241a3479..918a440ed 100644 --- a/test/stderr/0360 +++ b/test/stderr/0360 @@ -145,14 +145,14 @@ After routing: locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option" ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1234 -qf locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -242,7 +242,7 @@ After routing: Failed addresses: Deferred addresses: defer@test.ex ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0361 b/test/stderr/0361 index 0261f20aa..dd2259ca8 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -7,11 +7,11 @@ LOG: MAIN Completed Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -54,7 +54,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -217,7 +217,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to kilos <kilos@recurse.test.ex.test.ex> transport=t2 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaY-0005vi-00 to kilos using t2 appendfile transport entered @@ -239,7 +239,7 @@ LOG: MAIN *> kilos <kilos@recurse.test.ex> R=r4 T=t2 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 DSN: processing router : r4 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex @@ -262,6 +262,6 @@ LOG: MAIN end delivery of 10HmaY-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0362 b/test/stderr/0362 index 39fe09628..f380f9d9c 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -90,4 +90,4 @@ SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.0.0.0] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0364 b/test/stderr/0364 index 34dc3910a..a09400659 100644 --- a/test/stderr/0364 +++ b/test/stderr/0364 @@ -210,4 +210,4 @@ routed by r2 router envelope to: xxx@testsub.sub.test.ex transport: t1 host testsub.sub.test.ex [V4NET.99.0.3] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0368 b/test/stderr/0368 index 9bf935f8b..0d3ccb719 100644 --- a/test/stderr/0368 +++ b/test/stderr/0368 @@ -26,4 +26,4 @@ finding IP address for ten-2.test.ex doing DNS lookup fully qualified name = ten-2.test.ex ten-2.test.ex V4NET.0.0.2 mx=-1 sort=xx ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0370 b/test/stderr/0370 index ddabe6bea..c2de395fa 100644 --- a/test/stderr/0370 +++ b/test/stderr/0370 @@ -1,16 +1,16 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -18,7 +18,7 @@ dropping to exim gid; retaining priv uid >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> |TESTSUITE/bin/iefbr14 <-------- changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1 - uid=EXIM_UID gid=CALLER_GID pid=pppp + uid=EXIM_UID gid=CALLER_GID pid=p1236 t1 transport entered direct command: argv[0] = 'TESTSUITE/bin/iefbr14' @@ -31,8 +31,8 @@ t1 transport returned OK for |TESTSUITE/bin/iefbr14 LOG: MAIN => |TESTSUITE/bin/iefbr14 <userx@test.ex> R=r1 T=t1 changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0371 b/test/stderr/0371 index 41ad3ff50..0a38e9d77 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex sender_fullhost = [V4NET.0.0.0] @@ -143,4 +143,4 @@ SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (something) [V4NET.0.0.0] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0374 b/test/stderr/0374 index 69f54579b..a9b2c20e9 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -439,7 +439,7 @@ LOG: MAIN => CALLER <CALLER@myhost.test.ex> R=real T=real LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0375 b/test/stderr/0375 index 0f16b9e52..5ef71ed20 100644 --- a/test/stderr/0375 +++ b/test/stderr/0375 @@ -919,16 +919,16 @@ LOG: MAIN => CALLER <CALLER@myhost.test.ex> P=<> R=real T=real LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN d3@myhost.test.ex <d3@myhost.test.ex>: error ignored log writing disabled LOG: MAIN b1@myhost.test.ex <b1@myhost.test.ex>: error ignored log writing disabled ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -1027,5 +1027,5 @@ LOG: MAIN log writing disabled LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0376 b/test/stderr/0376 index 8fdcf31a7..bdcbfddbe 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -29,7 +29,7 @@ wrote callout cache domain record for localhost: wrote positive callout cache address record for ok@localhost LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -46,7 +46,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -69,7 +69,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -105,7 +105,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -126,7 +126,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -159,7 +159,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -179,7 +179,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -222,7 +222,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -242,7 +242,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -281,7 +281,7 @@ wrote callout cache domain record for otherhost2: wrote positive callout cache address record for ok@otherhost2 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -299,7 +299,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -332,7 +332,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1245 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -350,7 +350,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -383,7 +383,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1247 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -401,7 +401,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1248 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -446,7 +446,7 @@ wrote callout cache domain record for otherhost41: wrote positive callout cache address record for ok@otherhost41 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1249 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -465,7 +465,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1250 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -504,7 +504,7 @@ wrote callout cache domain record for otherhost21: wrote positive callout cache address record for ok@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1251 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -537,7 +537,7 @@ wrote callout cache domain record for otherhost21: wrote positive callout cache address record for ok2@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1252 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -575,7 +575,7 @@ wrote callout cache domain record for otherhost31: wrote positive callout cache address record for ok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1253 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -608,7 +608,7 @@ wrote callout cache domain record for otherhost31: wrote positive callout cache address record for okok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1254 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -646,7 +646,7 @@ wrote callout cache domain record for otherhost31: wrote positive callout cache address record for okokok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1255 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -680,7 +680,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1256 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -719,7 +719,7 @@ wrote callout cache domain record for otherhost52: wrote positive callout cache address record for okokok@otherhost52 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1257 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -754,7 +754,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1258 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -787,7 +787,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1259 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -828,7 +828,7 @@ wrote callout cache domain record for otherhost9: wrote positive callout cache address record for ok@otherhost9 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -873,4 +873,4 @@ wrote callout cache domain record for test.ex: 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1261 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0377 b/test/stderr/0377 index 158a2e161..192d87f43 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -308,14 +308,14 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN => cccc <cccc@myhost.test.ex> R=cccc_accept T=t1 locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1234 -qf locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -551,16 +551,16 @@ cccc@myhost.test.ex was previously delivered (t1 transport): discarded aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1235 -qf locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -796,7 +796,7 @@ cccc@myhost.test.ex was previously delivered (t1 transport): discarded aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 -qf +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0378 b/test/stderr/0378 index a3a48dcff..2511ccbca 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -44,7 +44,7 @@ text "This is an autoreply"' (tainted) data is an Exim filter program Filter: start of processing Filter: end of processing ->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> rda_interpret: subprocess yield=0 error=NULL set transport t3 aaaa router generated >CALLER@myhost.test.ex @@ -153,8 +153,8 @@ After routing: Deferred addresses: LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3 locking TESTSUITE/spool/db/retry.lockfile @@ -165,14 +165,14 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1 locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1234 -qf locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -235,7 +235,7 @@ text "This is an autoreply"' (tainted) data is an Exim filter program Filter: start of processing Filter: end of processing ->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> rda_interpret: subprocess yield=0 error=NULL set transport t3 aaaa router generated >CALLER@myhost.test.ex @@ -302,7 +302,7 @@ After routing: Deferred addresses: defer_aaaa@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0379 b/test/stderr/0379 index ac97e71dd..f37cea959 100644 --- a/test/stderr/0379 +++ b/test/stderr/0379 @@ -132,14 +132,14 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN => cccc <aaaa@myhost.test.ex> R=bc T=t1 locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1234 -qf locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: defer@myhost.test.ex @@ -168,7 +168,7 @@ After routing: Deferred addresses: defer@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0380 b/test/stderr/0380 index b4a0af0ca..835ef21ad 100644 --- a/test/stderr/0380 +++ b/test/stderr/0380 @@ -82,5 +82,5 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN => bbbb <bbbb@myhost.test.ex> R=r3 T=t1 locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0381 b/test/stderr/0381 index 19c4e8a3a..0219ec4cc 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -1,13 +1,13 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL sender_fullhost = [V4NET.99.99.97] @@ -85,4 +85,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0382 b/test/stderr/0382 index 28d847e34..ad2abb495 100644 --- a/test/stderr/0382 +++ b/test/stderr/0382 @@ -34,23 +34,23 @@ LOG: MAIN ** CALLER@test.ex: Unrouteable address LOG: MAIN Frozen (delivery error message) ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1234 -qf LOG: MAIN cancelled by timeout_frozen_after LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0386 b/test/stderr/0386 index 88f25cf71..e4275b92f 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -1,13 +1,13 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -147,17 +147,17 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -258,7 +258,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -329,7 +329,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to 2 using t1 appendfile transport entered @@ -359,7 +359,7 @@ LOG: MAIN => 2 <2@b> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -380,7 +380,7 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< rset SMTP>> 250 Reset OK @@ -451,7 +451,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -522,7 +522,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ set_process_info: pppp delivering 10HmaY-0005vi-00 to 2 using t1 appendfile transport entered @@ -552,7 +552,7 @@ LOG: MAIN => 2 <2@b> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: @@ -573,11 +573,11 @@ LOG: MAIN end delivery of 10HmaY-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0387 b/test/stderr/0387 index 0a27a5878..2b78fcea4 100644 --- a/test/stderr/0387 +++ b/test/stderr/0387 @@ -467,4 +467,4 @@ dropping to exim gid; retaining priv uid in TESTSUITE/aux-fixed/0387.1 lookup yielded: [*.b.c] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0388 b/test/stderr/0388 index 1c2a5a388..afa54d2b4 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -70,7 +70,7 @@ After routing: search_tidyup called search_tidyup called changed uid/gid: remote delivery to x@y with transport=smtp - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile @@ -132,7 +132,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 LOG: MAIN == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1] changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -174,12 +174,12 @@ end of retry processing exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name= sender address = set_process_info: pppp accepting a local non-SMTP message from <> @@ -233,7 +233,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1237 configuration file is TESTSUITE/test-config trusted user admin user @@ -282,7 +282,7 @@ After routing: Deferred addresses: search_tidyup called changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: @@ -294,9 +294,9 @@ LOG: MAIN Completed search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss @@ -304,4 +304,4 @@ LOG: MAIN Completed search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0391 b/test/stderr/0391 index 8c76173e3..499bbdf21 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -70,4 +70,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [1.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0393 b/test/stderr/0393 index dcd490152..75f92b9e1 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -32,7 +32,7 @@ writing data block fd=dddd size=sss timeout=0 process pppp running as transport filter: fd_write=dddd fd_read=dddd cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 ->>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter-writer) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (tpt-filter-writer) terminating with rc=0 >>>>>>>>>>>>>>>> process pppp writing to transport filter copying from the filter waiting for filter process @@ -46,8 +46,8 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -85,8 +85,8 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -126,5 +126,5 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0396 b/test/stderr/0396 index 60661f82f..6902c5cf9 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@the.local.host.name set_process_info: pppp accepting a local SMTP message from <CALLER@the.local.host.name> @@ -35,4 +35,4 @@ SMTP>> 221 the.local.host.name closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0397 b/test/stderr/0397 index 4d9dcaa47..98184d91f 100644 --- a/test/stderr/0397 +++ b/test/stderr/0397 @@ -1,7 +1,7 @@ 1999-03-02 09:44:33 Cannot open main log file "/non/existent/path/to/force/failure/main": Permission denied: euid=uuuu egid=EXIM_GID -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=p1234 1999-03-02 09:44:33 Cannot open main log file "/non/existent/path/to/force/failure/main": Permission denied: euid=uuuu egid=EXIM_GID -SYSLOG: '2017-07-30 18:51:05 Start queue run: pid=pppp' +SYSLOG: '2017-07-30 18:51:05 Start queue run: pid=p1234' SYSLOG: '2017-07-30 18:51:05 Cannot open main log file "/non/existent/path/to/force/failure/main": Permission denied: euid=uuuu egid=EXIM_GID' SYSLOG: 'exim: could not open panic log - aborting: see message(s) above' exim: could not open panic log - aborting: see message(s) above diff --git a/test/stderr/0398 b/test/stderr/0398 index 81854ad9b..d3ce2928f 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -262,4 +262,4 @@ SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0399 b/test/stderr/0399 index 2137d262c..a3b583e11 100644 --- a/test/stderr/0399 +++ b/test/stderr/0399 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -41,4 +41,4 @@ parse_forward_list: r3 router declined for x@y failed to expand "more" in r3 router: unknown variable name "unknown_variable" search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0402 b/test/stderr/0402 index 3f892f56d..fcf398d26 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -1,11 +1,11 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -385,7 +385,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config trusted user @@ -676,7 +676,7 @@ no retry data available ╰──(tainted) search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=/non-exist/usery current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered @@ -754,7 +754,7 @@ LOG: MAIN no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=/non-exist/CALLER current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered @@ -832,7 +832,7 @@ LOG: MAIN no retry data available search_tidyup called changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1238 home=/non-exist/CALLER current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 appendfile transport entered @@ -864,7 +864,7 @@ no retry data available ╰──(tainted) search_tidyup called changed uid/gid: local delivery to usery <usery@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=/non-exist/usery current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to usery using t1 appendfile transport entered @@ -896,7 +896,7 @@ no retry data available ╰──(tainted) search_tidyup called changed uid/gid: local delivery to userz <userz@test.ex> transport=t2 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1240 home=/userz current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to userz using t2 appendfile transport entered @@ -915,7 +915,7 @@ LOG: MAIN => userz <userz@test.ex> R=r3 T=t2 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -992,6 +992,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0403 b/test/stderr/0403 index 1d5d26297..65e474cc6 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -48,7 +48,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -163,7 +163,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=/usr current=/usr set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using t1 +++TRANSPORT: @@ -189,7 +189,7 @@ LOG: MAIN *> TESTSUITE/test-mail/junk <userx@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 DSN: processing router : r1 DSN: processing successful delivery address: TESTSUITE/test-mail/junk @@ -212,6 +212,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0404 b/test/stderr/0404 index 4832fdb28..11a56c98d 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -147,7 +147,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -199,13 +199,13 @@ mail text rhubarb seen finish' search_tidyup called changed uid/gid: r2 router (recipient is userx@test.ex) - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 turned off address rewrite logging (not root or exim in this process) data is an Exim filter program Filter: start of processing Filter: end of processing search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> rda_interpret: subprocess yield=0 error=NULL set transport t1 r2 router generated >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... @@ -243,7 +243,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <>sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... using t1 t1 transport entered @@ -251,11 +251,11 @@ taking data from address exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -916,7 +916,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1239 configuration file is TESTSUITE/test-config trusted user admin user @@ -17376,7 +17376,7 @@ sender@test.ex is a duplicate address: discarded no retry data available search_tidyup called changed uid/gid: local delivery to sender <sender@test.ex> transport=t2 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ set_process_info: pppp delivering 10HmaY-0005vi-00 to sender using t2 appendfile transport entered @@ -17408,7 +17408,7 @@ LOG: MAIN => sender <sender@test.ex> R=r1 T=t2 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1239 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: @@ -17429,9 +17429,9 @@ LOG: MAIN end delivery of 10HmaY-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>> t1 transport succeeded search_tidyup called journalling >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...:userx@test.ex @@ -17443,7 +17443,7 @@ LOG: MAIN => >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <userx@test.ex> R=r2 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -17474,6 +17474,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0408 b/test/stderr/0408 index 74a7101bc..6d60f187a 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -48,7 +48,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -142,7 +142,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 appendfile transport entered @@ -172,7 +172,7 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -193,6 +193,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0414 b/test/stderr/0414 index 582df33d1..7ab5307dd 100644 --- a/test/stderr/0414 +++ b/test/stderr/0414 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -136,4 +136,4 @@ routed by r3 router envelope to: x@a.domain transport: t1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0419 b/test/stderr/0419 index 7094f3fed..d61a9ff03 100644 --- a/test/stderr/0419 +++ b/test/stderr/0419 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID @@ -50,4 +50,4 @@ routed by dnslookup router transport: smtp host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0426 b/test/stderr/0426 index 23080e96d..c526fe9f1 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -91,9 +91,9 @@ After routing: Deferred addresses: LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0432 b/test/stderr/0432 index f1c2fa553..dbbe00b2c 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -26,11 +26,11 @@ MUNGED: ::1 will be omitted in what follows >>> end of ACL "mail": ACCEPT Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -140,14 +140,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [1.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [1.2.3.4] @@ -224,7 +224,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [1.2.3.4] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> 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/0433 b/test/stderr/0433 index 3d0e9e9f8..36d610438 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -2,100 +2,100 @@ ******** SERVER ******** Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1234 creating notifier socket +p1234 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv4) port 1225 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1240 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1235 creating notifier socket +p1235 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv4) port 1226 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 + exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port 1225 port 1226 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1241 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1236 creating notifier socket +p1236 @TESTSUITE/spool/exim_daemon_notify listening on 127.0.0.1 port 1228 listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv4) port 1226 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) + exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1237 creating notifier socket +p1237 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv4) port 1226 listening on 127.0.0.1 port 1228 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 + exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -108,19 +108,19 @@ listening on 127.0.0.1 port 1228 listening on all interfaces (IPv4) port 1227 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) + exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -133,13 +133,13 @@ listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv4) port 1226 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1239 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 + exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port 1225 port 1226 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1245 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0435 b/test/stderr/0435 index d35eb0440..916f23c94 100644 --- a/test/stderr/0435 +++ b/test/stderr/0435 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex> @@ -22,4 +22,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0437 b/test/stderr/0437 index 8c2cf0a8a..a8142da54 100644 --- a/test/stderr/0437 +++ b/test/stderr/0437 @@ -15,7 +15,7 @@ configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 search_tidyup called search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" @@ -49,7 +49,7 @@ LOG: MAIN LOG: MAIN Completed search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" @@ -83,8 +83,8 @@ LOG: MAIN LOG: MAIN Completed search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp + End queue run: pid=p1234 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0438 b/test/stderr/0438 index 040f4f959..8d5a42f87 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -2,7 +2,7 @@ ******** SERVER ******** Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -14,19 +14,19 @@ creating notifier socket listening on all interfaces (IPv4) port 1225 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1237 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -38,19 +38,19 @@ creating notifier socket listening on all interfaces (IPv4) port 1225 pid written to TESTSUITE/spool/exim-daemon.anotherpid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX +p1238 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -62,13 +62,13 @@ creating notifier socket listening on all interfaces (IPv4) port 1225 pid written to TESTSUITE/spool/mypidfile changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port 1225 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX +p1239 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0450 b/test/stderr/0450 index b665681b0..96eea9fd0 100644 --- a/test/stderr/0450 +++ b/test/stderr/0450 @@ -28,14 +28,14 @@ added 10HmaX-0005vi-00 to queue for 127.0.0.1 Leaving t1 transport LOG: MAIN == userx@test.ex R=r1 T=t1 defer (dd): Connection refused ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- t1 transport entered @@ -57,7 +57,7 @@ already listed for 127.0.0.1 Leaving t1 transport LOG: MAIN == userx@test.ex R=r1 T=t1 defer (dd): Connection refused ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0462 b/test/stderr/0462 index 0fc6bd06a..d10624cf5 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -49,7 +49,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -85,7 +85,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -119,4 +119,4 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0463 b/test/stderr/0463 index 314cc21c1..a7e19c7de 100644 --- a/test/stderr/0463 +++ b/test/stderr/0463 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -78,4 +78,4 @@ routed by all router transport: smtp host ten-1.test.ex [V4NET.0.0.1] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0464 b/test/stderr/0464 index c77aa978f..2427a77f3 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex> @@ -176,4 +176,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0465 b/test/stderr/0465 index ae038dfff..bcf5f0393 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -1,13 +1,13 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL set_process_info: pppp accepting a local SMTP message from <CALLER> @@ -31,18 +31,18 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed) Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL set_process_info: pppp accepting a local SMTP message from <CALLER> @@ -106,17 +106,17 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL set_process_info: pppp accepting a local SMTP message from <CALLER> @@ -175,4 +175,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0469 b/test/stderr/0469 index 4f6d216d2..01ab58f8a 100644 --- a/test/stderr/0469 +++ b/test/stderr/0469 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -33,4 +33,4 @@ host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts: r1 router declined for x@mxt1c.test.ex no more routers search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0471 b/test/stderr/0471 index 6a07b3961..0c170e1bc 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> @@ -25722,14 +25722,14 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> @@ -25882,14 +25882,14 @@ Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> @@ -26042,14 +26042,14 @@ Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> @@ -26126,14 +26126,14 @@ rewrite headers LOG: MAIN rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123... search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> @@ -26260,4 +26260,4 @@ Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0473 b/test/stderr/0473 index ad6ff23a2..b0d536923 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -29,7 +29,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -53,4 +53,4 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0476 b/test/stderr/0476 index ea51b3f53..a51e2ce21 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -4,9 +4,9 @@ admin user dropping to exim gid; retaining priv uid set_process_info: pppp running the queue (single queue run) LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 set_process_info: pppp running queue: 10HmaX-0005vi-00-H -set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid pppp) +set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid p1234) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- set_process_info: pppp delivering 10HmaX-0005vi-00 using t1 @@ -100,15 +100,15 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00 LOG: MAIN == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue set_process_info: pppp running queue: 10HmaY-0005vi-00-H -set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid pppp) +set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid p1234) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@test.ex <-------- set_process_info: pppp delivering 10HmaY-0005vi-00 using t1 @@ -130,9 +130,9 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 LOG: retry_defer MAIN == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex' set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0479 b/test/stderr/0479 index 0985a5e68..8339fc3f8 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@the.local.host.name sender_fullhost = [1.2.3.4] @@ -90,4 +90,4 @@ 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 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0483 b/test/stderr/0483 index 91731409c..2839e479f 100644 --- a/test/stderr/0483 +++ b/test/stderr/0483 @@ -27,4 +27,4 @@ LOG: MAIN REJECT U=CALLER F=<sender@domain1> rejected RCPT <other@domain2> LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0484 b/test/stderr/0484 index 56ce2e13a..6b3e2f02f 100644 --- a/test/stderr/0484 +++ b/test/stderr/0484 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -134,4 +134,4 @@ sender address = CALLER@myhost.test.ex in TESTSUITE/aux-fixed/0484.aliases lookup yielded: userx search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0487 b/test/stderr/0487 index 5b9855f4a..81796f56b 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -1,13 +1,13 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -74,7 +74,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -143,7 +143,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 appendfile transport entered @@ -175,7 +175,7 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -196,11 +196,11 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0489 b/test/stderr/0489 index ef3c01ca7..f1e4ed2c5 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -30,7 +30,7 @@ Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -62,7 +62,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -94,7 +94,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -126,7 +126,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -158,7 +158,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -190,7 +190,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -222,7 +222,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -254,4 +254,4 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0499 b/test/stderr/0499 index 87e535978..bb12c160b 100644 --- a/test/stderr/0499 +++ b/test/stderr/0499 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -48,4 +48,4 @@ routed by r1 router envelope to: ph@mxt1.test.ex transport: t1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0512 b/test/stderr/0512 index 56971b680..3765a681f 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -3,7 +3,7 @@ configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1234 -qf >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- t1 transport entered @@ -78,20 +78,20 @@ LOG: MAIN => :blackhole: <CALLER@myhost.test.ex> R=r0 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qf + Start queue run: pid=p1235 -qf >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- t1 transport entered @@ -146,11 +146,11 @@ LOG: MAIN => :blackhole: <CALLER@myhost.test.ex> R=r0 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 -qf +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0514 b/test/stderr/0514 index ab55c9a2e..8f0b2aeec 100644 --- a/test/stderr/0514 +++ b/test/stderr/0514 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp listing the queue looking in TESTSUITE/spool//input reading spool file 10HmaX-0005vi-00-H diff --git a/test/stderr/0529 b/test/stderr/0529 index 0ceaeb8e6..536804c4d 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -45,14 +45,14 @@ Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox) x@test.ex: no retry items end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: x@test.ex @@ -84,7 +84,7 @@ Deferred addresses: TESTSUITE/test-mail/rmbox: no retry items x@test.ex: no retry items end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0543 b/test/stderr/0543 index 8aa6d862d..96b982184 100644 --- a/test/stderr/0543 +++ b/test/stderr/0543 @@ -3,7 +3,7 @@ configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@domain1 @@ -38,7 +38,7 @@ LOG: MAIN => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@domain1 @@ -52,7 +52,7 @@ After routing: Failed addresses: Deferred addresses: usery@domain1 ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0544 b/test/stderr/0544 index c5e4ac7cc..6f298e2f1 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -387,8 +387,8 @@ LOG: MAIN ╰─────result: yes ├──expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} ╰─────result: yes ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config @@ -452,4 +452,4 @@ LOG: smtp_connection MAIN ╰──(tainted) LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0545 b/test/stderr/0545 index 96f235c76..01621df47 100644 --- a/test/stderr/0545 +++ b/test/stderr/0545 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -72,10 +72,10 @@ routed by dns router transport: smtp host eximtesthost.test.ex [ip4.ip4.ip4.ip4] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -122,4 +122,4 @@ routed by dns router transport: smtp host eximtesthost.test.ex [ip4.ip4.ip4.ip4] search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0554 b/test/stderr/0554 index 3c72f6683..66e995e2e 100644 --- a/test/stderr/0554 +++ b/test/stderr/0554 @@ -36,7 +36,7 @@ Writing retry data for R:x@y:<CALLER@myhost.test.ex> first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -93,4 +93,4 @@ Deferred addresses: end of retry processing LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0563 b/test/stderr/0563 index e5e30bebd..c266746a8 100644 --- a/test/stderr/0563 +++ b/test/stderr/0563 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS sender address = CALLER@testexim.test.ex Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID @@ -38,4 +38,4 @@ routed by router2 router envelope to: joe-real@testexim.test.ex transport: local_delivery search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0575 b/test/stderr/0575 index 10310378c..2e643b4cd 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex sender_fullhost = [V4NET.0.0.0] @@ -66,4 +66,4 @@ SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.0.0.0] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0578 b/test/stderr/0578 index 94f44370e..1f589288c 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -31,7 +31,7 @@ wrote callout cache domain record for localhost: wrote positive callout cache address record for ok@localhost LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -48,7 +48,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -71,7 +71,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -109,7 +109,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -130,7 +130,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -167,7 +167,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -187,7 +187,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -232,7 +232,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -252,7 +252,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -293,7 +293,7 @@ wrote callout cache domain record for otherhost2: wrote positive callout cache address record for ok@otherhost2 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -311,7 +311,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -346,7 +346,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1245 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -364,7 +364,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -399,7 +399,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1247 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -417,7 +417,7 @@ LOG: MAIN (random) LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1248 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -464,7 +464,7 @@ wrote callout cache domain record for otherhost41: wrote positive callout cache address record for ok@otherhost41 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1249 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -483,7 +483,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1250 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -524,7 +524,7 @@ wrote callout cache domain record for otherhost21: wrote positive callout cache address record for ok@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1251 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -559,7 +559,7 @@ wrote callout cache domain record for otherhost21: wrote positive callout cache address record for ok2@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1252 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -599,7 +599,7 @@ wrote callout cache domain record for otherhost31: wrote positive callout cache address record for ok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1253 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -634,7 +634,7 @@ wrote callout cache domain record for otherhost31: wrote positive callout cache address record for okok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1254 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -674,7 +674,7 @@ wrote callout cache domain record for otherhost31: wrote positive callout cache address record for okokok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1255 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -710,7 +710,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1256 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -751,7 +751,7 @@ wrote callout cache domain record for otherhost52: wrote positive callout cache address record for okokok@otherhost52 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1257 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -788,7 +788,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1258 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -823,7 +823,7 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1259 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -866,7 +866,7 @@ wrote callout cache domain record for otherhost9: wrote positive callout cache address record for ok@otherhost9 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -913,4 +913,4 @@ wrote callout cache domain record for test.ex: 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1261 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0609 b/test/stderr/0609 index f8b8aee0b..277281cc5 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -4,51 +4,51 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid -ppppp daemon_smtp_port overridden by -oX: -ppppp <: 1225 -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify -ppppp listening on all interfaces (IPv4) port 1225 -ppppp pid written to TESTSUITE/spool/exim-daemon.pid -ppppp LOG: MAIN -ppppp exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID -ppppp Listening... -ppppp Connection request from 127.0.0.1 port sssss -ppppp LOG: smtp_connection MAIN -ppppp SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) -ppppp Process ppppp is handling incoming connection from [127.0.0.1] -ppppp Process ppppp is ready for new message -ppppp using ACL "delay4_accept" -ppppp processing "accept" (TESTSUITE/test-config 24) -ppppp check delay = 4s -ppppp delay modifier requests 4-second delay -ppppp 1 SMTP accept process running -ppppp Listening... -ppppp accept: condition test succeeded in ACL "delay4_accept" -ppppp end of ACL "delay4_accept": ACCEPT -ppppp LOG: smtp_connection MAIN -ppppp SMTP connection from (test) [127.0.0.1] closed by QUIT -ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> -ppppp child ppppp ended: status=0x0 -ppppp normal exit, 0 -ppppp 0 SMTP accept processes now running -ppppp Listening... -ppppp Connection request from 127.0.0.1 port sssss -ppppp LOG: smtp_connection MAIN -ppppp SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) -ppppp Process ppppp is handling incoming connection from [127.0.0.1] -ppppp Process ppppp is ready for new message -ppppp using ACL "delay4_accept" -ppppp processing "accept" (TESTSUITE/test-config 24) -ppppp check delay = 4s -ppppp delay modifier requests 4-second delay -ppppp delay cancelled by peer close -ppppp accept: condition test succeeded in ACL "delay4_accept" -ppppp end of ACL "delay4_accept": ACCEPT -ppppp LOG: lost_incoming_connection MAIN -ppppp unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs -ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>> -ppppp 1 SMTP accept process running -ppppp SIGTERM/SIGINT seen -ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +daemon_smtp_port overridden by -oX: + <: 1225 +creating notifier socket + TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv4) port 1225 +pid written to TESTSUITE/spool/exim-daemon.pid +LOG: MAIN + exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port 1225 +daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID +Listening... +Connection request from 127.0.0.1 port sssss +LOG: smtp_connection MAIN + SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) +p1235 Process p1235 is handling incoming connection from [127.0.0.1] +p1235 Process p1235 is ready for new message +p1235 using ACL "delay4_accept" +p1235 processing "accept" (TESTSUITE/test-config 24) +p1235 check delay = 4s +p1235 delay modifier requests 4-second delay +p1236 SMTP accept process running +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 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> +child p1235 ended: status=0x0 + normal exit, 0 +p1237 SMTP accept processes now running +Listening... +Connection request from 127.0.0.1 port sssss +LOG: smtp_connection MAIN + SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) +p1238 Process p1238 is handling incoming connection from [127.0.0.1] +p1238 Process p1238 is ready for new message +p1238 using ACL "delay4_accept" +p1238 processing "accept" (TESTSUITE/test-config 24) +p1238 check delay = 4s +p1238 delay modifier requests 4-second delay +p1238 delay cancelled by peer close +p1238 accept: condition test succeeded in ACL "delay4_accept" +p1238 end of ACL "delay4_accept": ACCEPT +p1238 LOG: lost_incoming_connection MAIN +p1238 unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs +p1238 >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>> +p1236 SMTP accept process running +SIGTERM/SIGINT seen +>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0620 b/test/stderr/0620 index 89f0e616a..5ad58b213 100644 --- a/test/stderr/0620 +++ b/test/stderr/0620 @@ -50,7 +50,7 @@ LOG: MAIN $0 'trythiskey.ex' $1 '' LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config @@ -102,4 +102,4 @@ LOG: MAIN $0 'trythiskey.ex' $1 '' LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0623 b/test/stderr/0623 index 08025cf85..1c8dee9e2 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -60,8 +60,8 @@ all IP addresses skipped or deferred at least one address Leaving send_to_server transport 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 end of data: 451 Service not available ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -126,8 +126,8 @@ LOG: MAIN permreject@test.ex: error ignored LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -192,5 +192,5 @@ all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == permreject@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 end of data ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0628 b/test/stderr/0628 index 29c50af8c..f7f3a8682 100644 --- a/test/stderr/0628 +++ b/test/stderr/0628 @@ -1,210 +1,210 @@ -01:01:01 1234 warn: condition test succeeded in ACL "chk_data" -01:01:01 1234 processing "accept" (TESTSUITE/test-config 28) -01:01:01 1234 accept: condition test succeeded in ACL "chk_data" -01:01:01 1234 end of ACL "chk_data": ACCEPT -01:01:01 1234 ╭considering: ${tod_full} -01:01:01 1234 ├──expanding: ${tod_full} -01:01:01 1234 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 -01:01:01 1234 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -01:01:01 1234 DSN: **** SPOOL_OUT - address: <dest@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -01:01:01 1234 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H -01:01:01 1234 Size of headers = sss -01:01:01 1234 LOG: MAIN -01:01:01 1234 <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss -01:01:01 1234 SMTP>> 250 OK id=10HmaX-0005vi-00 -01:01:01 1234 search_tidyup called -01:01:01 1234 Sender: tester@test.ex -01:01:01 1234 Recipients: -01:01:01 1234 dest@test.ex -01:01:01 1234 forked delivery process1235 -01:01:01 1234 Process1236 is ready for new message -01:01:01 1234 smtp_setup_msg entered -01:01:01 1234 SMTP<< QUIT -01:01:01 1234 SMTP>> 221 myhost.test.ex closing connection -01:01:01 1234 LOG: smtp_connection MAIN -01:01:01 1234 SMTP connection from (test.ex) [127.0.0.1] closed by QUIT -01:01:01 1237 Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=pppp D=fff9ffff -01:01:01 1237 macros_trusted overridden to true by whitelisting -01:01:01 1237 changed uid/gid: forcing real = effective -01:01:01 1237 uid=uuuu gid=EXIM_GID pid=pppp -01:01:01 1237 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys -01:01:01 1237 configuration file is TESTSUITE/test-config -01:01:01 1237 trusted user -01:01:01 1237 admin user -01:01:01 1237 dropping to exim gid; retaining priv uid -01:01:01 1237 set_process_info: pppp delivering specified messages -01:01:01 1237 set_process_info: pppp delivering 10HmaX-0005vi-00 -01:01:01 1237 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -01:01:01 1237 reading spool file 10HmaX-0005vi-00-H -01:01:01 1237 user=EXIMUSER uid=EXIM_UID gid=EXIM_GID sender=tester@test.ex -01:01:01 1237 sender_fullhost = (test.ex) [127.0.0.1] -01:01:01 1237 sender_rcvhost = [127.0.0.1] (helo=test.ex) -01:01:01 1237 sender_local=0 ident=unset -01:01:01 1237 Non-recipients: -01:01:01 1237 Empty Tree -01:01:01 1237 ---- End of tree ---- -01:01:01 1237 recipients_count=1 -01:01:01 1237 **** SPOOL_IN - No additional fields -01:01:01 1237 body_linecount=1 message_linecount=7 -01:01:01 1237 DSN: set orcpt: flags: 0x0 -01:01:01 1237 Delivery address list: -01:01:01 1237 dest@test.ex -01:01:01 1237 locking TESTSUITE/spool/db/retry.lockfile -01:01:01 1237 locked TESTSUITE/spool/db/retry.lockfile -01:01:01 1237 EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY -01:01:01 1237 returned from EXIM_DBOPEN: (nil) -01:01:01 1237 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory -01:01:01 1237 no retry data available -01:01:01 1237 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1237 Considering: dest@test.ex -01:01:01 1237 unique = dest@test.ex -01:01:01 1237 no domain retry record -01:01:01 1237 no address retry record -01:01:01 1237 dest@test.ex: queued for routing -01:01:01 1237 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1237 routing dest@test.ex -01:01:01 1237 --------> r1 router <-------- -01:01:01 1237 local_part=dest domain=test.ex -01:01:01 1237 calling r1 router -01:01:01 1237 rda_interpret (string): ':blackhole:' -01:01:01 1237 expanded: ':blackhole:' -01:01:01 1237 file is not a filter file -01:01:01 1237 parse_forward_list: :blackhole: -01:01:01 1237 extract item: :blackhole: -01:01:01 1237 address :blackhole:d -01:01:01 1237 LOG: MAIN -01:01:01 1237 => :blackhole: <dest@test.ex> R=r1 -01:01:01 1237 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1237 After routing: -01:01:01 1237 Local deliveries: -01:01:01 1237 Remote deliveries: -01:01:01 1237 Failed addresses: -01:01:01 1237 Deferred addresses: -01:01:01 1237 search_tidyup called -01:01:01 1237 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> -01:01:01 1237 changed uid/gid: post-delivery tidying -01:01:01 1237 uid=EXIM_UID gid=EXIM_GID pid=pppp -01:01:01 1237 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 -01:01:01 1237 Processing retry items -01:01:01 1237 Succeeded addresses: -01:01:01 1237 dest@test.ex: no retry items -01:01:01 1237 Failed addresses: -01:01:01 1237 Deferred addresses: -01:01:01 1237 end of retry processing -01:01:01 1237 DSN: processing router : r1 -01:01:01 1237 DSN: processing successful delivery address: dest@test.ex -01:01:01 1237 DSN: Sender_address: tester@test.ex -01:01:01 1237 DSN: orcpt: NULL flags: 0x0 -01:01:01 1237 DSN: envid: NULL ret: 0 -01:01:01 1237 DSN: Final recipient: dest@test.ex -01:01:01 1237 DSN: Remote SMTP server supports DSN: 0 -01:01:01 1237 DSN: not sending DSN success message -01:01:01 1237 LOG: MAIN -01:01:01 1237 Completed -01:01:01 1237 end delivery of 10HmaX-0005vi-00 -01:01:01 1237 search_tidyup called -01:01:01 1237 search_tidyup called -01:01:01 1237 >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -01:01:01 1234 search_tidyup called -01:01:01 1234 SMTP>>(close on process exit) -01:01:01 1234 >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> -01:01:01 1238 check control = queue_only -01:01:01 1238 warn: condition test succeeded in ACL "chk_data" -01:01:01 1238 processing "accept" (TESTSUITE/test-config 28) -01:01:01 1238 accept: condition test succeeded in ACL "chk_data" -01:01:01 1238 end of ACL "chk_data": ACCEPT -01:01:01 1238 ╭considering: ${tod_full} -01:01:01 1238 ├──expanding: ${tod_full} -01:01:01 1238 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 -01:01:01 1238 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -01:01:01 1238 DSN: **** SPOOL_OUT - address: <dest2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -01:01:01 1238 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H -01:01:01 1238 Size of headers = sss -01:01:01 1238 LOG: MAIN -01:01:01 1238 <= tester2@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss -01:01:01 1238 LOG: delay_delivery MAIN -01:01:01 1238 no immediate delivery: queued by ACL -01:01:01 1238 SMTP>> 250 OK id=10HmaY-0005vi-00 -01:01:01 1238 search_tidyup called -01:01:01 1238 Sender: tester2@test.ex -01:01:01 1238 Recipients: -01:01:01 1238 dest2@test.ex -01:01:01 1238 Process1239 is ready for new message -01:01:01 1238 smtp_setup_msg entered -01:01:01 1238 SMTP<< QUIT -01:01:01 1238 SMTP>> 221 myhost.test.ex closing connection -01:01:01 1238 LOG: smtp_connection MAIN -01:01:01 1238 SMTP connection from (test.ex) [127.0.0.1] closed by QUIT -01:01:01 1238 search_tidyup called -01:01:01 1238 SMTP>>(close on process exit) -01:01:01 1238 >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> -01:01:01 1240 debug enabled by spoolfile -01:01:01 1240 sender_fullhost = (test.ex) [127.0.0.1] -01:01:01 1240 sender_rcvhost = [127.0.0.1] (helo=test.ex) -01:01:01 1240 sender_local=0 ident=unset -01:01:01 1240 Non-recipients: -01:01:01 1240 Empty Tree -01:01:01 1240 ---- End of tree ---- -01:01:01 1240 recipients_count=1 -01:01:01 1240 **** SPOOL_IN - No additional fields -01:01:01 1240 body_linecount=1 message_linecount=7 -01:01:01 1240 DSN: set orcpt: flags: 0x0 -01:01:01 1240 Delivery address list: -01:01:01 1240 dest2@test.ex -01:01:01 1240 locking TESTSUITE/spool/db/retry.lockfile -01:01:01 1240 locked TESTSUITE/spool/db/retry.lockfile -01:01:01 1240 EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY -01:01:01 1240 returned from EXIM_DBOPEN: (nil) -01:01:01 1240 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory -01:01:01 1240 no retry data available -01:01:01 1240 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1240 Considering: dest2@test.ex -01:01:01 1240 unique = dest2@test.ex -01:01:01 1240 no domain retry record -01:01:01 1240 no address retry record -01:01:01 1240 dest2@test.ex: queued for routing -01:01:01 1240 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1240 routing dest2@test.ex -01:01:01 1240 --------> r1 router <-------- -01:01:01 1240 local_part=dest2 domain=test.ex -01:01:01 1240 calling r1 router -01:01:01 1240 rda_interpret (string): ':blackhole:' -01:01:01 1240 expanded: ':blackhole:' -01:01:01 1240 file is not a filter file -01:01:01 1240 parse_forward_list: :blackhole: -01:01:01 1240 extract item: :blackhole: -01:01:01 1240 address :blackhole:d -01:01:01 1240 LOG: MAIN -01:01:01 1240 => :blackhole: <dest2@test.ex> R=r1 -01:01:01 1240 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1240 After routing: -01:01:01 1240 Local deliveries: -01:01:01 1240 Remote deliveries: -01:01:01 1240 Failed addresses: -01:01:01 1240 Deferred addresses: -01:01:01 1240 search_tidyup called -01:01:01 1240 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> -01:01:01 1240 changed uid/gid: post-delivery tidying -01:01:01 1240 uid=EXIM_UID gid=EXIM_GID pid=pppp -01:01:01 1240 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 -01:01:01 1240 Processing retry items -01:01:01 1240 Succeeded addresses: -01:01:01 1240 dest2@test.ex: no retry items -01:01:01 1240 Failed addresses: -01:01:01 1240 Deferred addresses: -01:01:01 1240 end of retry processing -01:01:01 1240 DSN: processing router : r1 -01:01:01 1240 DSN: processing successful delivery address: dest2@test.ex -01:01:01 1240 DSN: Sender_address: tester2@test.ex -01:01:01 1240 DSN: orcpt: NULL flags: 0x0 -01:01:01 1240 DSN: envid: NULL ret: 0 -01:01:01 1240 DSN: Final recipient: dest2@test.ex -01:01:01 1240 DSN: Remote SMTP server supports DSN: 0 -01:01:01 1240 DSN: not sending DSN success message -01:01:01 1240 LOG: MAIN -01:01:01 1240 Completed -01:01:01 1240 end delivery of 10HmaY-0005vi-00 -01:01:01 1240 search_tidyup called -01:01:01 1240 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +01:01:01 p1237 warn: condition test succeeded in ACL "chk_data" +01:01:01 p1237 processing "accept" (TESTSUITE/test-config 28) +01:01:01 p1237 accept: condition test succeeded in ACL "chk_data" +01:01:01 p1237 end of ACL "chk_data": ACCEPT +01:01:01 p1237 ╭considering: ${tod_full} +01:01:01 p1237 ├──expanding: ${tod_full} +01:01:01 p1237 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +01:01:01 p1237 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +01:01:01 p1237 DSN: **** SPOOL_OUT - address: <dest@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 +01:01:01 p1237 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +01:01:01 p1237 Size of headers = sss +01:01:01 p1237 LOG: MAIN +01:01:01 p1237 <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss +01:01:01 p1237 SMTP>> 250 OK id=10HmaX-0005vi-00 +01:01:01 p1237 search_tidyup called +01:01:01 p1237 Sender: tester@test.ex +01:01:01 p1237 Recipients: +01:01:01 p1237 dest@test.ex +01:01:01 p1237 forked delivery processp1238 +01:01:01 p1237 Process p1237 is ready for new message +01:01:01 p1237 smtp_setup_msg entered +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 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 +01:01:01 p1239 uid=uuuu gid=EXIM_GID pid=p1239 +01:01:01 p1239 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys +01:01:01 p1239 configuration file is TESTSUITE/test-config +01:01:01 p1239 trusted user +01:01:01 p1239 admin user +01:01:01 p1239 dropping to exim gid; retaining priv uid +01:01:01 p1239 set_process_info: pppp delivering specified messages +01:01:01 p1239 set_process_info: pppp delivering 10HmaX-0005vi-00 +01:01:01 p1239 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D +01:01:01 p1239 reading spool file 10HmaX-0005vi-00-H +01:01:01 p1239 user=EXIMUSER uid=EXIM_UID gid=EXIM_GID sender=tester@test.ex +01:01:01 p1239 sender_fullhost = (test.ex) [127.0.0.1] +01:01:01 p1239 sender_rcvhost = [127.0.0.1] (helo=test.ex) +01:01:01 p1239 sender_local=0 ident=unset +01:01:01 p1239 Non-recipients: +01:01:01 p1239 Empty Tree +01:01:01 p1239 ---- End of tree ---- +01:01:01 p1239 recipients_count=1 +01:01:01 p1239 **** SPOOL_IN - No additional fields +01:01:01 p1239 body_linecount=1 message_linecount=7 +01:01:01 p1239 DSN: set orcpt: flags: 0x0 +01:01:01 p1239 Delivery address list: +01:01:01 p1239 dest@test.ex +01:01:01 p1239 locking TESTSUITE/spool/db/retry.lockfile +01:01:01 p1239 locked TESTSUITE/spool/db/retry.lockfile +01:01:01 p1239 EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY +01:01:01 p1239 returned from EXIM_DBOPEN: (nil) +01:01:01 p1239 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory +01:01:01 p1239 no retry data available +01:01:01 p1239 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1239 Considering: dest@test.ex +01:01:01 p1239 unique = dest@test.ex +01:01:01 p1239 no domain retry record +01:01:01 p1239 no address retry record +01:01:01 p1239 dest@test.ex: queued for routing +01:01:01 p1239 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1239 routing dest@test.ex +01:01:01 p1239 --------> r1 router <-------- +01:01:01 p1239 local_part=dest domain=test.ex +01:01:01 p1239 calling r1 router +01:01:01 p1239 rda_interpret (string): ':blackhole:' +01:01:01 p1239 expanded: ':blackhole:' +01:01:01 p1239 file is not a filter file +01:01:01 p1239 parse_forward_list: :blackhole: +01:01:01 p1239 extract item: :blackhole: +01:01:01 p1239 address :blackhole:d +01:01:01 p1239 LOG: MAIN +01:01:01 p1239 => :blackhole: <dest@test.ex> R=r1 +01:01:01 p1239 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1239 After routing: +01:01:01 p1239 Local deliveries: +01:01:01 p1239 Remote deliveries: +01:01:01 p1239 Failed addresses: +01:01:01 p1239 Deferred addresses: +01:01:01 p1239 search_tidyup called +01:01:01 p1239 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> +01:01:01 p1239 changed uid/gid: post-delivery tidying +01:01:01 p1239 uid=EXIM_UID gid=EXIM_GID pid=p1239 +01:01:01 p1239 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +01:01:01 p1239 Processing retry items +01:01:01 p1239 Succeeded addresses: +01:01:01 p1239 dest@test.ex: no retry items +01:01:01 p1239 Failed addresses: +01:01:01 p1239 Deferred addresses: +01:01:01 p1239 end of retry processing +01:01:01 p1239 DSN: processing router : r1 +01:01:01 p1239 DSN: processing successful delivery address: dest@test.ex +01:01:01 p1239 DSN: Sender_address: tester@test.ex +01:01:01 p1239 DSN: orcpt: NULL flags: 0x0 +01:01:01 p1239 DSN: envid: NULL ret: 0 +01:01:01 p1239 DSN: Final recipient: dest@test.ex +01:01:01 p1239 DSN: Remote SMTP server supports DSN: 0 +01:01:01 p1239 DSN: not sending DSN success message +01:01:01 p1239 LOG: MAIN +01:01:01 p1239 Completed +01:01:01 p1239 end delivery of 10HmaX-0005vi-00 +01:01:01 p1239 search_tidyup called +01:01:01 p1239 search_tidyup called +01:01:01 p1239 >>>>>>>>>>>>>>>> Exim pid=p1239 (daemon-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +01:01:01 p1237 search_tidyup called +01:01:01 p1237 SMTP>>(close on process exit) +01:01:01 p1237 >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> +01:01:01 p1240 check control = queue_only +01:01:01 p1240 warn: condition test succeeded in ACL "chk_data" +01:01:01 p1240 processing "accept" (TESTSUITE/test-config 28) +01:01:01 p1240 accept: condition test succeeded in ACL "chk_data" +01:01:01 p1240 end of ACL "chk_data": ACCEPT +01:01:01 p1240 ╭considering: ${tod_full} +01:01:01 p1240 ├──expanding: ${tod_full} +01:01:01 p1240 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +01:01:01 p1240 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +01:01:01 p1240 DSN: **** SPOOL_OUT - address: <dest2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 +01:01:01 p1240 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +01:01:01 p1240 Size of headers = sss +01:01:01 p1240 LOG: MAIN +01:01:01 p1240 <= tester2@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss +01:01:01 p1240 LOG: delay_delivery MAIN +01:01:01 p1240 no immediate delivery: queued by ACL +01:01:01 p1240 SMTP>> 250 OK id=10HmaY-0005vi-00 +01:01:01 p1240 search_tidyup called +01:01:01 p1240 Sender: tester2@test.ex +01:01:01 p1240 Recipients: +01:01:01 p1240 dest2@test.ex +01:01:01 p1240 Process p1240 is ready for new message +01:01:01 p1240 smtp_setup_msg entered +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 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 >>>>>>>>>>>>>>>> +01:01:01 p1241 debug enabled by spoolfile +01:01:01 p1241 sender_fullhost = (test.ex) [127.0.0.1] +01:01:01 p1241 sender_rcvhost = [127.0.0.1] (helo=test.ex) +01:01:01 p1241 sender_local=0 ident=unset +01:01:01 p1241 Non-recipients: +01:01:01 p1241 Empty Tree +01:01:01 p1241 ---- End of tree ---- +01:01:01 p1241 recipients_count=1 +01:01:01 p1241 **** SPOOL_IN - No additional fields +01:01:01 p1241 body_linecount=1 message_linecount=7 +01:01:01 p1241 DSN: set orcpt: flags: 0x0 +01:01:01 p1241 Delivery address list: +01:01:01 p1241 dest2@test.ex +01:01:01 p1241 locking TESTSUITE/spool/db/retry.lockfile +01:01:01 p1241 locked TESTSUITE/spool/db/retry.lockfile +01:01:01 p1241 EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY +01:01:01 p1241 returned from EXIM_DBOPEN: (nil) +01:01:01 p1241 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory +01:01:01 p1241 no retry data available +01:01:01 p1241 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1241 Considering: dest2@test.ex +01:01:01 p1241 unique = dest2@test.ex +01:01:01 p1241 no domain retry record +01:01:01 p1241 no address retry record +01:01:01 p1241 dest2@test.ex: queued for routing +01:01:01 p1241 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1241 routing dest2@test.ex +01:01:01 p1241 --------> r1 router <-------- +01:01:01 p1241 local_part=dest2 domain=test.ex +01:01:01 p1241 calling r1 router +01:01:01 p1241 rda_interpret (string): ':blackhole:' +01:01:01 p1241 expanded: ':blackhole:' +01:01:01 p1241 file is not a filter file +01:01:01 p1241 parse_forward_list: :blackhole: +01:01:01 p1241 extract item: :blackhole: +01:01:01 p1241 address :blackhole:d +01:01:01 p1241 LOG: MAIN +01:01:01 p1241 => :blackhole: <dest2@test.ex> R=r1 +01:01:01 p1241 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1241 After routing: +01:01:01 p1241 Local deliveries: +01:01:01 p1241 Remote deliveries: +01:01:01 p1241 Failed addresses: +01:01:01 p1241 Deferred addresses: +01:01:01 p1241 search_tidyup called +01:01:01 p1241 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> +01:01:01 p1241 changed uid/gid: post-delivery tidying +01:01:01 p1241 uid=EXIM_UID gid=EXIM_GID pid=p1241 +01:01:01 p1241 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +01:01:01 p1241 Processing retry items +01:01:01 p1241 Succeeded addresses: +01:01:01 p1241 dest2@test.ex: no retry items +01:01:01 p1241 Failed addresses: +01:01:01 p1241 Deferred addresses: +01:01:01 p1241 end of retry processing +01:01:01 p1241 DSN: processing router : r1 +01:01:01 p1241 DSN: processing successful delivery address: dest2@test.ex +01:01:01 p1241 DSN: Sender_address: tester2@test.ex +01:01:01 p1241 DSN: orcpt: NULL flags: 0x0 +01:01:01 p1241 DSN: envid: NULL ret: 0 +01:01:01 p1241 DSN: Final recipient: dest2@test.ex +01:01:01 p1241 DSN: Remote SMTP server supports DSN: 0 +01:01:01 p1241 DSN: not sending DSN success message +01:01:01 p1241 LOG: MAIN +01:01:01 p1241 Completed +01:01:01 p1241 end delivery of 10HmaY-0005vi-00 +01:01:01 p1241 search_tidyup called +01:01:01 p1241 >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/0629 b/test/stderr/0629 index ad96aa70e..16390eec3 100644 --- a/test/stderr/0629 +++ b/test/stderr/0629 @@ -16,7 +16,7 @@ LOG: smtp_connection MAIN SMTP connection from (test.ex) [127.0.0.1] closed by QUIT search_tidyup called SMTP>>(close on process exit) ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** 1999-03-02 09:44:33 H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex> diff --git a/test/stderr/0630 b/test/stderr/0630 index 0aaf71ac8..c1fbe0a46 100644 --- a/test/stderr/0630 +++ b/test/stderr/0630 @@ -1,25 +1,25 @@ -01:01:01 1234 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1234 Considering: dest3@test.ex -01:01:01 1234 unique = dest3@test.ex -01:01:01 1234 no domain retry record -01:01:01 1234 no address retry record -01:01:01 1234 dest3@test.ex: queued for routing -01:01:01 1234 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -01:01:01 1234 routing dest3@test.ex -01:01:01 1234 --------> r0 router <-------- -01:01:01 1234 local_part=dest3 domain=test.ex -01:01:01 1234 checking local_parts -01:01:01 1234 ╭considering: /$local_part -01:01:01 1234 ├───────text: / -01:01:01 1234 ├considering: $local_part -01:01:01 1234 ├──expanding: /$local_part -01:01:01 1234 ╰─────result: /dest3 -01:01:01 1234 ╰──(tainted) -01:01:01 1234 LOG: MAIN PANIC -01:01:01 1234 Tainted filename '/dest3' -01:01:01 1234 LOG: MAIN PANIC DIE -01:01:01 1234 failed to open /dest3 when checking "/$local_part": Permission denied (euid=uuuu egid=EXIM_GID) -01:01:01 1234 search_tidyup called -01:01:01 1234 >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept-delivery) terminating with rc=1 >>>>>>>>>>>>>>>> +01:01:01 p1235 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1235 Considering: dest3@test.ex +01:01:01 p1235 unique = dest3@test.ex +01:01:01 p1235 no domain retry record +01:01:01 p1235 no address retry record +01:01:01 p1235 dest3@test.ex: queued for routing +01:01:01 p1235 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +01:01:01 p1235 routing dest3@test.ex +01:01:01 p1235 --------> r0 router <-------- +01:01:01 p1235 local_part=dest3 domain=test.ex +01:01:01 p1235 checking local_parts +01:01:01 p1235 ╭considering: /$local_part +01:01:01 p1235 ├───────text: / +01:01:01 p1235 ├considering: $local_part +01:01:01 p1235 ├──expanding: /$local_part +01:01:01 p1235 ╰─────result: /dest3 +01:01:01 p1235 ╰──(tainted) +01:01:01 p1235 LOG: MAIN PANIC +01:01:01 p1235 Tainted filename '/dest3' +01:01:01 p1235 LOG: MAIN PANIC DIE +01:01:01 p1235 failed to open /dest3 when checking "/$local_part": Permission denied (euid=uuuu egid=EXIM_GID) +01:01:01 p1235 search_tidyup called +01:01:01 p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept-delivery) terminating with rc=1 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/0911 b/test/stderr/0911 index 2f78100f1..ebed0ed8f 100644 --- a/test/stderr/0911 +++ b/test/stderr/0911 @@ -61,10 +61,10 @@ LOG: MAIN => good@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L K C="250 OK chunked message data" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -126,10 +126,10 @@ LOG: MAIN => nopipe@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] K C="250 OK chunked message data" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -194,10 +194,10 @@ all IP addresses skipped or deferred at least one address Leaving send_to_server transport 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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -264,10 +264,10 @@ LOG: MAIN permreject@test.ex: error ignored LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -334,7 +334,7 @@ all IP addresses skipped or deferred at least one address Leaving send_to_server transport 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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/1006 b/test/stderr/1006 index 77a5a8478..3fe18948a 100644 --- a/test/stderr/1006 +++ b/test/stderr/1006 @@ -21,7 +21,7 @@ DNS lookup of v6.test.ex (A) gave NO_DATA returning DNS_NODATA faking res_search(A) response length as 65535 writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -42,6 +42,6 @@ DNS lookup of v6.test.ex (A) gave NO_DATA returning DNS_NODATA faking res_search(A) response length as 65535 writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/1007 b/test/stderr/1007 index 9ec794af5..48dbda1a2 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -2,61 +2,61 @@ ******** SERVER ******** Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1234 creating notifier socket +p1234 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv6) port 1225 listening on all interfaces (IPv4) port 1225 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) + exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1235 creating notifier socket +p1235 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv6) port 1225 listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv6) port 1226 listening on all interfaces (IPv4) port 1226 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) + exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1236 creating notifier socket +p1236 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv6) port 1225 listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv6) port 1226 @@ -64,25 +64,25 @@ listening on all interfaces (IPv4) port 1226 listening on 127.0.0.1 port 1228 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 + exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1237 creating notifier socket +p1237 @TESTSUITE/spool/exim_daemon_notify listening on all interfaces (IPv6) port 1225 listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv6) port 1226 @@ -90,42 +90,42 @@ listening on all interfaces (IPv4) port 1226 listening on 127.0.0.1 port 1228 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 + exim x.yz daemon started: pid=p1237, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1245 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify +p1238 creating notifier socket +p1238 @TESTSUITE/spool/exim_daemon_notify listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1226 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} + exim x.yz daemon started: pid=p1238, no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1246 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -139,19 +139,19 @@ listening on all interfaces (IPv4) port 1227 listening on 127.0.0.1 port 1228 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1239 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 + exim x.yz daemon started: pid=p1239, no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1247 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1240 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -166,19 +166,19 @@ listening on 127.0.0.1 port 1227 listening on 127.0.0.1 port 1225 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1240 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} + exim x.yz daemon started: pid=p1240, no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1248 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1241 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -192,13 +192,13 @@ listening on all interfaces (IPv4) port 1225 listening on all interfaces (IPv4) port 1226 pid written to TESTSUITE/spool/exim-daemon.pid changed uid/gid: running as a daemon - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1241 LOG: MAIN - exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) + exim x.yz daemon started: pid=p1241, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... SIGTERM/SIGINT seen -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +p1249 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/1150 b/test/stderr/1150 index 306deb614..d13b4ba4a 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -1,6 +1,6 @@ LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid pppp) + Start queue run: pid=p1234 -qf +delivering 10HmaX-0005vi-00 (queue run pid p1234) 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 @@ -35,7 +35,7 @@ LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid pppp) +delivering 10HmaY-0005vi-00 (queue run pid p1234) 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 @@ -107,6 +107,6 @@ LOG: MAIN LOG: MAIN Completed LOG: queue_run MAIN - End queue run: pid=pppp -qf + End queue run: pid=p1234 -qf ******** SERVER ******** diff --git a/test/stderr/1157 b/test/stderr/1157 index 2eecddf91..35389aa8c 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -3,10 +3,10 @@ configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> + Start queue run: pid=p1234 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> 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 @@ -40,7 +40,7 @@ LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -61,7 +61,7 @@ LOG: MAIN => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1246 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -87,20 +87,20 @@ LOG: MAIN => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1247 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1248 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> + Start queue run: pid=p1235 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1249 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1251 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> 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 @@ -134,7 +134,7 @@ LOG: MAIN => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1252 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -155,7 +155,7 @@ LOG: MAIN => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1253 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -181,20 +181,20 @@ LOG: MAIN => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1254 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1255 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> + Start queue run: pid=p1236 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1256 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1257 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1258 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> 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 @@ -238,7 +238,7 @@ LOG: MAIN => user_p@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1259 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -277,7 +277,7 @@ LOG: MAIN => user_r@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1260 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -311,9 +311,9 @@ LOG: MAIN => user_q@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1261 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1236 -qqf +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/1160 b/test/stderr/1160 index 7e04db4d1..554c350cb 100644 --- a/test/stderr/1160 +++ b/test/stderr/1160 @@ -1,6 +1,6 @@ LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid pppp) + Start queue run: pid=p1234 -qf +delivering 10HmaX-0005vi-00 (queue run pid p1234) 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 @@ -26,7 +26,7 @@ LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid pppp) +delivering 10HmaY-0005vi-00 (queue run pid p1234) 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 @@ -80,6 +80,6 @@ LOG: MAIN LOG: MAIN Completed LOG: queue_run MAIN - End queue run: pid=pppp -qf + End queue run: pid=p1234 -qf ******** SERVER ******** diff --git a/test/stderr/2035 b/test/stderr/2035 index 4d6b49bb6..5c46aba17 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -36,7 +36,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -75,7 +75,7 @@ LOG: MAIN => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/2135 b/test/stderr/2135 index 4d6b49bb6..5c46aba17 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -36,7 +36,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -75,7 +75,7 @@ LOG: MAIN => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/2200 b/test/stderr/2200 index b37f75f93..7f1722497 100644 --- a/test/stderr/2200 +++ b/test/stderr/2200 @@ -22,7 +22,7 @@ dropping to exim gid; retaining priv uid cached data used for lookup of a=localhost.test.ex lookup yielded: 127.0.0.1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -55,4 +55,4 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2201 b/test/stderr/2201 index c1c39ef28..d5c42d456 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -149,7 +149,7 @@ routed by r2 router envelope to: unknown@test.ex transport: local_delivery search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -192,7 +192,7 @@ LOG: MAIN <= a@shorthost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** Exim version x.yz .... @@ -200,44 +200,44 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -ppppp daemon_smtp_port overridden by -oX: -ppppp <: 1225 -ppppp creating notifier socket -ppppp TESTSUITE/spool/exim_daemon_notify -ppppp listening on all interfaces (IPv4) port 1225 -ppppp pid written to TESTSUITE/spool/exim-daemon.pid -ppppp LOG: MAIN -ppppp exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID -ppppp Listening... -ppppp Connection request from 127.0.0.1 port sssss -ppppp Process ppppp is handling incoming connection from [127.0.0.1] -ppppp Process ppppp is ready for new message -ppppp 1 SMTP accept process running -ppppp Listening... -ppppp dnslists check: rbl.test.ex/V4NET.11.12.14 -ppppp new DNS lookup for 14.12.11.V4NET.rbl.test.ex -ppppp dnslists: wrote cache entry, ttl=2 -ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) -ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex -ppppp dnslists check: rbl.test.ex/V4NET.11.12.14 -ppppp dnslists: using result of previous lookup -ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) -ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex -ppppp dnslists check: rbl.test.ex/V4NET.11.12.14 -ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex -ppppp dnslists: wrote cache entry, ttl=2 -ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) -ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex -ppppp LOG: MAIN -ppppp <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex -ppppp Process ppppp is ready for new message -ppppp LOG: smtp_connection MAIN -ppppp SMTP connection from localhost (myhost.test.ex) [127.0.0.1] closed by QUIT -ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> -ppppp child ppppp ended: status=0x0 -ppppp normal exit, 0 -ppppp 0 SMTP accept processes now running -ppppp Listening... -ppppp SIGTERM/SIGINT seen -ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> +daemon_smtp_port overridden by -oX: + <: 1225 +creating notifier socket + TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv4) port 1225 +pid written to TESTSUITE/spool/exim-daemon.pid +LOG: MAIN + exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port 1225 +daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID +Listening... +Connection request from 127.0.0.1 port sssss +p1238 Process p1238 is handling incoming connection from [127.0.0.1] +p1238 Process p1238 is ready for new message +p1240 SMTP accept process running +Listening... +p1238 dnslists check: rbl.test.ex/V4NET.11.12.14 +p1238 new DNS lookup for 14.12.11.V4NET.rbl.test.ex +p1238 dnslists: wrote cache entry, ttl=2 +p1238 DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) +p1238 => that means V4NET.11.12.14 is listed at rbl.test.ex +p1238 dnslists check: rbl.test.ex/V4NET.11.12.14 +p1238 dnslists: using result of previous lookup +p1238 DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) +p1238 => that means V4NET.11.12.14 is listed at rbl.test.ex +p1238 dnslists check: rbl.test.ex/V4NET.11.12.14 +p1238 cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex +p1238 dnslists: wrote cache entry, ttl=2 +p1238 DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) +p1238 => that means V4NET.11.12.14 is listed at rbl.test.ex +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 +>>>>>>>>>>>>>>>> Exim pid=p1238 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> +p1235 child p1238 ended: status=0x0 +p1235 normal exit, 0 +p1235 0 SMTP accept processes now running +p1235 Listening... +p1235 SIGTERM/SIGINT seen +p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2202 b/test/stderr/2202 index dd9f2ff14..f2856b019 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [ip4.ip4.ip4.ip4] @@ -92,4 +92,4 @@ 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 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2600 b/test/stderr/2600 index e774502f2..b396f2a74 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -134,14 +134,14 @@ dropping to exim gid; retaining priv uid creating new cache entry lookup yielded: name=it's id=its search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -235,14 +235,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -336,14 +336,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -426,14 +426,14 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.10.10.10] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -477,7 +477,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1239 configuration file is TESTSUITE/test-config trusted user admin user @@ -555,7 +555,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@myhost.test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 appendfile transport entered @@ -594,7 +594,7 @@ LOG: MAIN => userx <userx@myhost.test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1239 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -615,9 +615,9 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -633,7 +633,7 @@ dropping to exim gid; retaining priv uid creating new cache entry lookup yielded: Ayen Other search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -649,7 +649,7 @@ dropping to exim gid; retaining priv uid creating new cache entry lookup yielded: Ayen Other search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -657,7 +657,7 @@ dropping to exim gid; retaining priv uid search_open: sqlite "NULL" Using sqlite_dbfile: nonabsolute_filename search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -674,4 +674,4 @@ dropping to exim gid; retaining priv uid creating new cache entry lookup failed search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2610 b/test/stderr/2610 index 56ae41f8e..b1374232a 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -227,14 +227,14 @@ search_tidyup called close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root close MYSQL connection: 127.0.0.1:1223/test/root ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -440,14 +440,14 @@ LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called close MYSQL connection: 127.0.0.1:1223/test/root ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -497,7 +497,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1237 configuration file is TESTSUITE/test-config trusted user admin user @@ -596,7 +596,7 @@ close MYSQL connection: 127.0.0.1:1223/test/root no retry data available search_tidyup called changed uid/gid: local delivery to ph10 <ph10@myhost.test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1238 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to ph10 using t1 appendfile transport entered @@ -641,7 +641,7 @@ LOG: MAIN => ph10 <ph10@myhost.test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -662,6 +662,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2620 b/test/stderr/2620 index dd3fa8844..ba77eee38 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -213,14 +213,14 @@ dropping to exim gid; retaining priv uid search_tidyup called close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER close PGSQL connection: localhost:1223/test/CALLER ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -588,14 +588,14 @@ LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called close PGSQL connection: localhost:1223/test/CALLER ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -639,7 +639,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config trusted user admin user @@ -719,7 +719,7 @@ close PGSQL connection: localhost:1223/test/CALLER no retry data available search_tidyup called changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 appendfile transport entered @@ -760,7 +760,7 @@ LOG: MAIN => CALLER <CALLER@myhost.test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -781,9 +781,9 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -801,6 +801,6 @@ dropping to exim gid; retaining priv uid lookup yielded: Philip Hazel search_tidyup called close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/3000 b/test/stderr/3000 index 86c8b4261..6b6711697 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -59,7 +59,7 @@ LOG: MAIN log from Perl ├──expanding: ${perl{log_write}{log from Perl}} ╰─────result: Wrote log ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN diff --git a/test/stderr/3201 b/test/stderr/3201 index 601a9ec85..0dd94ca54 100644 --- a/test/stderr/3201 +++ b/test/stderr/3201 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [10.0.0.1] @@ -40,14 +40,14 @@ SMTP>> 550 Administrative prohibition LOG: connection_reject MAIN REJECT H=[10.0.0.1] rejected connection in "connect" ACL search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [10.0.0.2] @@ -83,4 +83,4 @@ SMTP>> 550 Administrative prohibition LOG: connection_reject MAIN REJECT H=[10.0.0.2] rejected connection in "connect" ACL search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3210 b/test/stderr/3210 index 312fdc371..ff0d683c7 100644 --- a/test/stderr/3210 +++ b/test/stderr/3210 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -32,4 +32,4 @@ test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup test.ex in "! +local_domains"? list match deferred for ! +local_domains domains check lookup or other defer search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3212 b/test/stderr/3212 index 7b7719801..a0cc58945 100644 --- a/test/stderr/3212 +++ b/test/stderr/3212 @@ -1,6 +1,6 @@ Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -138,4 +138,4 @@ sender address = CALLER@myhost.test.ex in TESTSUITE/aux-fixed/3212.aliases lookup yielded: userx search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3400 b/test/stderr/3400 index bec165e5d..836dab202 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -391,14 +391,14 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu >>> host in chunking_advertise_hosts? no (end of list) Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -469,4 +469,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/4052 b/test/stderr/4052 index 3c07e0e2c..ed895e023 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -69,7 +69,7 @@ LOG: MAIN => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/4510 b/test/stderr/4510 index 20ded260a..4c0af880d 100644 --- a/test/stderr/4510 +++ b/test/stderr/4510 @@ -59,8 +59,8 @@ LOG: MAIN => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" ******** SERVER ******** diff --git a/test/stderr/4530 b/test/stderr/4530 index c8ddcca82..28e5b5721 100644 --- a/test/stderr/4530 +++ b/test/stderr/4530 @@ -69,8 +69,8 @@ LOG: MAIN => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbL-0005vi-00" LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" ******** SERVER ******** diff --git a/test/stderr/4802 b/test/stderr/4802 index e3578a608..25abeaef6 100644 --- a/test/stderr/4802 +++ b/test/stderr/4802 @@ -7,7 +7,7 @@ DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded DNS lookup of a-aa.test.ex (A) using fakens DNS lookup of a-aa.test.ex (A) succeeded DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -17,4 +17,4 @@ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA DNS lookup of a-sec.test.ex (A) using fakens DNS lookup of a-sec.test.ex (A) succeeded ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/4803 b/test/stderr/4803 index 9d851dd85..1f55809fa 100644 --- a/test/stderr/4803 +++ b/test/stderr/4803 @@ -9,7 +9,7 @@ DNS lookup of a-aa.test.ex (A) succeeded DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *)) DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *)) DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *)) ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -21,4 +21,4 @@ DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *)) DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *)) DNS lookup of a-sec.test.ex (A) using fakens DNS lookup of a-sec.test.ex (A) succeeded ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5000 b/test/stderr/5000 index 6ab026b45..85fa2045a 100644 --- a/test/stderr/5000 +++ b/test/stderr/5000 @@ -47,5 +47,5 @@ maildir_taggedX_appendfile transport returned DEFER for userx@myhost.test.ex added retry item for T:userx@myhost.test.ex: errno=-22 more_errno=dd flags=0 LOG: MAIN == userx@myhost.test.ex R=localuser T=maildir_taggedX_appendfile defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5004 b/test/stderr/5004 index e5b5340eb..e1cb2a1ea 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -50,7 +50,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -96,13 +96,13 @@ expanded: '# Exim filter save TESTSUITE/test-mail' search_tidyup called changed uid/gid: r1 router (recipient is userx@test.ex) - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 turned off address rewrite logging (not root or exim in this process) data is an Exim filter program Filter: start of processing Filter: end of processing search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> rda_interpret: subprocess yield=0 error=NULL set transport t1 r1 router generated TESTSUITE/test-mail @@ -140,7 +140,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail <TESTSUITE/test-mail> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail using t1 appendfile transport entered @@ -170,7 +170,7 @@ LOG: MAIN => TESTSUITE/test-mail <userx@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -201,6 +201,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5005 b/test/stderr/5005 index e20968c94..c7cc34539 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -48,7 +48,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -115,7 +115,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to nofile <nofile@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to nofile using t1 appendfile transport entered @@ -164,7 +164,7 @@ LOG: MAIN => nofile <nofile@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -185,16 +185,16 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1237 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -237,7 +237,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config trusted user admin user @@ -304,7 +304,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ set_process_info: pppp delivering 10HmaY-0005vi-00 to userx using t1 appendfile transport entered @@ -355,7 +355,7 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: @@ -376,16 +376,16 @@ LOG: MAIN end delivery of 10HmaY-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1240 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1240 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -428,7 +428,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1241 configuration file is TESTSUITE/test-config trusted user admin user @@ -495,7 +495,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1242 home=NULL current=/ set_process_info: pppp delivering 10HmaZ-0005vi-00 to userx using t1 appendfile transport entered @@ -540,7 +540,7 @@ LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1241 set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 Processing retry items Succeeded addresses: @@ -573,16 +573,16 @@ Size of headers = sss end delivery of 10HmaZ-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1243 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1243 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -625,7 +625,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1244 configuration file is TESTSUITE/test-config trusted user admin user @@ -700,7 +700,7 @@ retry record exists: age=ttt (max 1w) closed hints database and lockfile search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1245 home=NULL current=/ set_process_info: pppp delivering 10HmbA-0005vi-00 to userx using t1 appendfile transport entered @@ -732,7 +732,7 @@ LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1244 set_process_info: pppp tidying up after delivering 10HmbA-0005vi-00 Processing retry items Succeeded addresses: @@ -765,6 +765,6 @@ Size of headers = sss end delivery of 10HmbA-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5006 b/test/stderr/5006 index de8a9a269..4c7c490b0 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -48,7 +48,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -115,7 +115,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 appendfile transport entered @@ -162,7 +162,7 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -183,6 +183,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5008 b/test/stderr/5008 index 8e2b7df40..648ebd046 100644 --- a/test/stderr/5008 +++ b/test/stderr/5008 @@ -37,8 +37,8 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -79,5 +79,5 @@ LOG: MAIN => userx <userx@test.ex> R=r1 T=t1 LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5204 b/test/stderr/5204 index 64f9d9879..0bef3e1b7 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -20,7 +20,7 @@ command wrote: DECLINE cannot route this one (DECLINE) q router declined for "DECLINE cannot route this one (DECLINE)"@some.host "more" is false: skipping remaining routers no more routers ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -39,7 +39,7 @@ q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some requires uid=EXIM_UID gid=EXIM_GID current_directory=/ command wrote: FAIL cannot route this one (FAIL) q router forced address failure ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -61,7 +61,7 @@ LOG: PANIC q router: bad command yield: ERROR cannot route this one (ERROR) q router: defer for "ERROR cannot route this one (ERROR)"@some.host message: bad command yield: ERROR cannot route this one (ERROR) ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -81,7 +81,7 @@ requires uid=EXIM_UID gid=EXIM_GID current_directory=/ command wrote: DEFER cannot route this one (DEFER) q router: defer for "DEFER cannot route this one (DEFER)"@some.host message: cannot route this one (DEFER) ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -109,7 +109,7 @@ routed by q router envelope to: "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host transport: other_smtp host ten-1.test.ex [V4NET.0.0.1] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -149,7 +149,7 @@ routed by s router envelope to: PASS@some.host transport: smtp host 127.0.0.1 [127.0.0.1] ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -169,7 +169,7 @@ requires uid=EXIM_UID gid=EXIM_GID current_directory=/ command wrote: FREEZE cannot route this one (FREEZE) q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host message: cannot route this one (FREEZE) ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -224,7 +224,7 @@ domain = test.ex routed by pm router envelope to: postmaster@test.ex transport: null ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -271,4 +271,4 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5410 b/test/stderr/5410 index bbde8b873..96bbe857d 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -553,7 +553,7 @@ LOG: MAIN Completed LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config @@ -1070,7 +1070,7 @@ LOG: MAIN Completed LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config @@ -1587,6 +1587,6 @@ LOG: MAIN Completed LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/5420 b/test/stderr/5420 index 27889f255..65ace0ced 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -92,6 +92,9 @@ cmd buf flush ddd bytes ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ├──expanding: .outlook.com\$ ╰─────result: .outlook.com$ + compiled RE '.outlook.com$' not found in local cache + compiling RE '.outlook.com$' + compiled RE '.outlook.com$' saved in local cache ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}} ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}} ├──expanding: $item @@ -554,7 +557,7 @@ LOG: MAIN Completed LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config @@ -649,6 +652,9 @@ cmd buf flush ddd bytes ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ├──expanding: .outlook.com\$ ╰─────result: .outlook.com$ + compiled RE '.outlook.com$' not found in local cache + compiling RE '.outlook.com$' + compiled RE '.outlook.com$' saved in local cache ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}} ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}} ├──expanding: $item @@ -1071,7 +1077,7 @@ LOG: MAIN Completed LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config @@ -1166,6 +1172,9 @@ cmd buf flush ddd bytes ├considering: }} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ├──expanding: .outlook.com\$ ╰─────result: .outlook.com$ + compiled RE '.outlook.com$' not found in local cache + compiling RE '.outlook.com$' + compiled RE '.outlook.com$' saved in local cache ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}} {$1}} ├───scanning: }{\N^250-([\w.]+)\s\N}}} {$1}} ├──expanding: $item @@ -1588,6 +1597,6 @@ LOG: MAIN Completed LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stdout/2620 b/test/stdout/2620 index bbad4d565..f0c7fe6dd 100644 --- a/test/stdout/2620 +++ b/test/stdout/2620 @@ -1,4 +1,4 @@ -pg_ctl: server is running (PID: pppp) +pg_ctl: server is running (PID: p1234) POSTGRES "-D" "TESTSUITE/pgsql/data" "-p" "1223" "-k" "TESTSUITE/pgsql" INSERT 0 1 > Philip Hazel |