diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-06-26 12:10:03 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-06-26 12:21:08 +0100 |
| commit | 9f1a75f126ae217a3a3568b106c9133b3c5c413a (patch) | |
| tree | 9a7ac8fe4c827c981b49946260ea0d1aa1e5524d /test/stderr | |
| parent | 57318bfd2312ea561661906ca8001bd74a01b312 (diff) | |
| parent | 89318c714454e11217505d2163d807d5d827f50a (diff) | |
Merge branch '4.next'
Diffstat (limited to 'test/stderr')
145 files changed, 2822 insertions, 1652 deletions
diff --git a/test/stderr/0002 b/test/stderr/0002 index 7b9241b99..2f48f709f 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -26,6 +26,9 @@ dropping to exim gid; retaining priv uid ├considering: }{$2$1}fail} ├──expanding: \N^([ab]+)(\w+)$\N ╰─────result: ^([ab]+)(\w+)$ + compiled RE '^([ab]+)(\w+)$' not found in local cache + compiling RE '^([ab]+)(\w+)$' + compiled RE '^([ab]+)(\w+)$' saved in local cache ├──condition: match{abcd}{\N^([ab]+)(\w+)$\N} ├─────result: true ╭considering: $2$1}fail} @@ -49,6 +52,7 @@ dropping to exim gid; retaining priv uid ├considering: }{$2$1}fail} ├──expanding: \N^([ab]+)(\w+)$\N ╰─────result: ^([ab]+)(\w+)$ + compiled RE '^([ab]+)(\w+)$' found in local cache ├──condition: match{wxyz}{\N^([ab]+)(\w+)$\N} ├─────result: false ╭───scanning: $2$1}fail} @@ -128,7 +132,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 @@ -151,6 +155,9 @@ dropping to exim gid; retaining priv uid |considering: }{$2$1}fail} |--expanding: \N^([ab]+)(\w+)$\N \_____result: ^([ab]+)(\w+)$ + compiled RE '^([ab]+)(\w+)$' not found in local cache + compiling RE '^([ab]+)(\w+)$' + compiled RE '^([ab]+)(\w+)$' saved in local cache |--condition: match{abcd}{\N^([ab]+)(\w+)$\N} |-----result: true /considering: $2$1}fail} @@ -174,6 +181,7 @@ dropping to exim gid; retaining priv uid |considering: }{$2$1}fail} |--expanding: \N^([ab]+)(\w+)$\N \_____result: ^([ab]+)(\w+)$ + compiled RE '^([ab]+)(\w+)$' found in local cache |--condition: match{wxyz}{\N^([ab]+)(\w+)$\N} |-----result: false /---scanning: $2$1}fail} @@ -253,7 +261,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 +318,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 +417,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 +477,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 +522,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 +668,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 +677,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..395e32f9d 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -20,7 +20,7 @@ hostlist: checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com) -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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..63a312565 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 @@ -16,6 +16,8 @@ routing userx@test.again.dns --------> srv router <-------- local_part=userx domain=test.again.dns checking local_parts +compiled caseless RE '^srv' not found in local cache +compiled RE '^srv' saved in local cache userx in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -47,6 +49,7 @@ routing abcd@test.again.dns --------> srv router <-------- local_part=abcd domain=test.again.dns checking local_parts +compiled caseless RE '^srv' found in local cache abcd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -74,6 +77,7 @@ routing abcd@ten-1.test.ex --------> srv router <-------- local_part=abcd domain=ten-1.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache abcd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -117,6 +121,7 @@ routing usery@test.again.dns --------> srv router <-------- local_part=usery domain=test.again.dns checking local_parts +compiled caseless RE '^srv' found in local cache usery in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -150,6 +155,7 @@ routing userz@test.again.dns --------> srv router <-------- local_part=userz domain=test.again.dns checking local_parts +compiled caseless RE '^srv' found in local cache userz in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -178,6 +184,7 @@ routing xyz@ten-1.test.ex --------> srv router <-------- local_part=xyz domain=ten-1.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache xyz in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -207,10 +214,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 @@ -226,6 +233,8 @@ routing userx@test.fail.dns --------> srv router <-------- local_part=userx domain=test.fail.dns checking local_parts +compiled caseless RE '^srv' not found in local cache +compiled RE '^srv' saved in local cache userx in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -256,6 +265,7 @@ routing abcd@test.fail.dns --------> srv router <-------- local_part=abcd domain=test.fail.dns checking local_parts +compiled caseless RE '^srv' found in local cache abcd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -283,6 +293,7 @@ routing abcd@ten-1.test.ex --------> srv router <-------- local_part=abcd domain=ten-1.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache abcd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -326,6 +337,7 @@ routing usery@test.fail.dns --------> srv router <-------- local_part=usery domain=test.fail.dns checking local_parts +compiled caseless RE '^srv' found in local cache usery in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -358,6 +370,7 @@ routing userz@test.fail.dns --------> srv router <-------- local_part=userz domain=test.fail.dns checking local_parts +compiled caseless RE '^srv' found in local cache userz in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -386,6 +399,7 @@ routing xyz@ten-1.test.ex --------> srv router <-------- local_part=xyz domain=ten-1.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache xyz in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -415,10 +429,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 @@ -434,6 +448,8 @@ routing userx@nonexist.test.ex --------> srv router <-------- local_part=userx domain=nonexist.test.ex checking local_parts +compiled caseless RE '^srv' not found in local cache +compiled RE '^srv' saved in local cache userx in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -466,6 +482,7 @@ routing abcd@nonexist.test.ex --------> srv router <-------- local_part=abcd domain=nonexist.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache abcd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -494,6 +511,7 @@ routing abcd@ten-1.test.ex --------> srv router <-------- local_part=abcd domain=ten-1.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache abcd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -537,6 +555,7 @@ routing usery@nonexist.test.ex --------> srv router <-------- local_part=usery domain=nonexist.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache usery in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -570,6 +589,7 @@ routing userz@nonexist.test.ex --------> srv router <-------- local_part=userz domain=nonexist.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache userz in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -598,6 +618,7 @@ routing xyz@ten-1.test.ex --------> srv router <-------- local_part=xyz domain=ten-1.test.ex checking local_parts +compiled caseless RE '^srv' found in local cache xyz in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -627,10 +648,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 @@ -646,6 +667,8 @@ routing srv@test.again.dns --------> srv router <-------- local_part=srv domain=test.again.dns checking local_parts +compiled caseless RE '^srv' not found in local cache +compiled RE '^srv' saved in local cache srv in "^srv"? yes (matched "^srv") calling srv router srv router called for srv@test.again.dns @@ -668,6 +691,7 @@ routing srv@test.fail.dns --------> srv router <-------- local_part=srv domain=test.fail.dns checking local_parts +compiled caseless RE '^srv' found in local cache srv in "^srv"? yes (matched "^srv") calling srv router srv router called for srv@test.fail.dns @@ -692,10 +716,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 @@ -711,6 +735,8 @@ routing userx@nonexist.example.com --------> srv router <-------- local_part=userx domain=nonexist.example.com checking local_parts +compiled caseless RE '^srv' not found in local cache +compiled RE '^srv' saved in local cache userx in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -743,6 +769,7 @@ routing userd@nonexist.example.com --------> srv router <-------- local_part=userd domain=nonexist.example.com checking local_parts +compiled caseless RE '^srv' found in local cache userd in "^srv"? no (end of list) srv router skipped: local_parts mismatch --------> useryz router <-------- @@ -779,4 +806,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/0217 b/test/stderr/0217 index 3885a352c..1aac31e4c 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -1,7 +1,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmbL-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -834,7 +834,7 @@ LOG: MAIN LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmbP-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK diff --git a/test/stderr/0218 b/test/stderr/0218 index a048735a2..abba84e9f 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -4,23 +4,23 @@ 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 +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -40,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,33 +67,33 @@ 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 +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -117,33 +117,33 @@ 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 +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN == 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,15 +151,15 @@ 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 +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -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/0227 b/test/stderr/0227 index 8d766d61d..827d68e47 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -1,6 +1,6 @@ LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -20,7 +20,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -40,7 +40,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -60,7 +60,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -78,7 +78,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -97,7 +97,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -115,7 +115,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -133,7 +133,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -152,7 +152,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -170,15 +170,15 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -196,7 +196,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -214,7 +214,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -239,7 +239,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -266,7 +266,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher sverifier @@ -284,7 +284,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher rverifier @@ -304,7 +304,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher rverifier @@ -324,7 +324,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250- wotcher rverifier @@ -350,7 +350,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> LHLO myhost.test.ex SMTP<< 250 OK @@ -368,7 +368,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(closed)<< SMTP(close)>> cmdlog: '(unset)' @@ -380,7 +380,7 @@ LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN SMTP connection from root -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused LOG: MAIN REJECT diff --git a/test/stderr/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/0276 b/test/stderr/0276 index eb289faae..2b7158465 100644 --- a/test/stderr/0276 +++ b/test/stderr/0276 @@ -1,7 +1,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmaX-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-server id @@ -23,7 +23,7 @@ LOG: MAIN LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss delivering 10HmaY-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN @@ -39,7 +39,7 @@ LOG: MAIN LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-server id @@ -60,7 +60,7 @@ LOG: MAIN LOG: MAIN <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss delivering 10HmbA-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused LOG: MAIN diff --git a/test/stderr/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..995eafc77 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -11,8 +11,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: no domain record found for localhost callout cache: no address record found for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -60,8 +60,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused created log directory TESTSUITE/spool/log @@ -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 @@ -83,8 +83,8 @@ Considering bad@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: no address record found for bad@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -140,8 +140,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -193,8 +193,8 @@ Considering ok@otherhost Attempting full verification using callout callout cache: no domain record found for otherhost callout cache: no address record found for ok@otherhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -256,8 +256,8 @@ Considering ok@otherhost2 Attempting full verification using callout callout cache: no domain record found for otherhost2 callout cache: no address record found for ok@otherhost2 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -313,8 +313,8 @@ Considering ok@otherhost3 Attempting full verification using callout callout cache: no domain record found for otherhost3 callout cache: no address record found for ok@otherhost3 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -364,8 +364,8 @@ Considering ok@otherhost4 Attempting full verification using callout callout cache: no domain record found for otherhost4 callout cache: no address record found for ok@otherhost4 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -415,8 +415,8 @@ Considering ok@otherhost41 Attempting full verification using callout callout cache: no domain record found for otherhost41 callout cache: no address record found for ok@otherhost41 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -479,8 +479,8 @@ Considering ok@otherhost21 Attempting full verification using callout callout cache: no domain record found for otherhost21 callout cache: no address record found for ok@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -519,8 +519,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost21 callout cache: domain accepts RCPT TO:<postmaster@domain> callout cache: no address record found for ok2@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -551,8 +551,8 @@ Considering ok@otherhost31 Attempting full verification using callout callout cache: no domain record found for otherhost31 callout cache: no address record found for ok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -590,8 +590,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost31 callout cache: domain rejects random addresses callout cache: no address record found for okok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -622,8 +622,8 @@ Considering okokok@otherhost31 Attempting full verification using callout callout cache: domain record expired for otherhost31 callout cache: no address record found for okokok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -660,8 +660,8 @@ Considering okok@otherhost51 Attempting full verification using callout callout cache: no domain record found for otherhost51 callout cache: no address record found for okok@otherhost51 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -694,8 +694,8 @@ Considering okokok@otherhost52 Attempting full verification using callout callout cache: no domain record found for otherhost52 callout cache: no address record found for okokok@otherhost52 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -734,8 +734,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: no domain record found for x.y.z callout cache: no address record found for abcd@x.y.z/<somesender@a.domain> -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -769,8 +769,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: found domain record for x.y.z callout cache: no address record found for abcd@x.y.z -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -801,8 +801,8 @@ Considering ok@otherhost9 Attempting full verification using callout callout cache: no domain record found for otherhost9 callout cache: no address record found for ok@otherhost9 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -842,8 +842,8 @@ Considering z@test.ex Attempting full verification using callout callout cache: no domain record found for test.ex callout cache: no address record found for z@test.ex/<postmaster@myhost.test.ex> -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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..6b675d4ab 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 @@ -50,6 +50,8 @@ check acl = TESTSUITE/aux-fixed/0386.acl1 accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" (TESTSUITE/test-config 44) check local_parts = ^.*[@%!/|] + compiled caseless RE '^.*[@%!/|]' not found in local cache + compiled RE '^.*[@%!/|]' saved in local cache 1 in "^.*[@%!/|]"? no (end of list) deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "require" (TESTSUITE/test-config 44) @@ -106,6 +108,7 @@ check acl = TESTSUITE/aux-fixed/0386.acl1 accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" (TESTSUITE/test-config 44) check local_parts = ^.*[@%!/|] + compiled caseless RE '^.*[@%!/|]' found in local cache 1 in "^.*[@%!/|]"? no (end of list) deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "require" (TESTSUITE/test-config 44) @@ -147,17 +150,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 +261,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 +332,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 +362,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 +383,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 +454,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 +525,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 +555,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 +576,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..c3c11ca75 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 @@ -81,12 +81,15 @@ checking status of 127.0.0.1 no retry data available 127.0.0.1 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes SMTP<< 250 OK + compiled RE '.outlook.com$' not found in local cache + compiling RE '.outlook.com$' + compiled RE '.outlook.com$' saved in local cache 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> cmd buf flush ddd bytes @@ -116,15 +119,15 @@ checking status of V4NET.0.0.0 no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER -added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2 set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called -reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess +reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S from subprocess added retry item reading retry information for R:x@y from subprocess added retry item @@ -132,7 +135,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: @@ -157,14 +160,14 @@ Writing retry data for R:x@y address match test: subject=*@V4NET.0.0.0 pattern=* V4NET.0.0.0 in "*"? yes (matched "*") *@V4NET.0.0.0 in "*"? yes (matched "*") -retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 - dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 +retry for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S (y) = * 0 0 + dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S failing_interval=ttt message_age=ttt on queue longer than maximum retry -Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224 +Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S first failed=dddd last try=dddd next try=+0 expired=0 errno=dd more_errno=dd,A Network Error - dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 + dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded @@ -174,12 +177,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 +236,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 +285,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 +297,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 +307,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..bdd3940ae 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 @@ -129,13 +129,16 @@ Attempting full verification using callout callout cache: no address record found for qq@remote EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO mail.test.ex cmd buf flush ddd bytes SMTP<< 250 OK + compiled RE '.outlook.com$' not found in local cache + compiling RE '.outlook.com$' + compiled RE '.outlook.com$' saved in local cache not using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) @@ -262,4 +265,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..be534ca18 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] @@ -96,13 +96,16 @@ Attempting full verification using callout callout cache: no address record found for x@y EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes SMTP<< 250 OK + compiled RE '.outlook.com$' not found in local cache + compiling RE '.outlook.com$' + compiled RE '.outlook.com$' saved in local cache not using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) @@ -140,14 +143,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 +227,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) @@ -275,8 +278,8 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: no domain record found for b >>> callout cache: no address record found for a@b ->>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +>>> interface=NULL port=PORT_S +>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex @@ -323,8 +326,8 @@ MUNGED: ::1 will be omitted in what follows >>> Attempting full verification using callout >>> callout cache: no domain record found for q >>> callout cache: no address record found for p1@q ->>> interface=NULL port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +>>> interface=NULL port=PORT_S +>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/0433 b/test/stderr/0433 index 3d0e9e9f8..da7d5933d 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 -listening on all interfaces (IPv4) port 1225 +p1234 creating notifier socket +p1234 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv4) port PORT_D 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 -set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D 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=PORT_D -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 -listening on all interfaces (IPv4) port 1225 -listening on all interfaces (IPv4) port 1226 +p1235 creating notifier socket +p1235 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv4) port PORT_D2 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 -set_process_info: pppp daemon(x.yz): 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 PORT_D port PORT_D2 +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D port PORT_D2 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=PORT_D:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 -listening on 127.0.0.1 port 1228 -listening on all interfaces (IPv4) port 1225 -listening on all interfaces (IPv4) port 1226 +p1236 creating notifier socket +p1236 @TESTSUITE/spool/exim_daemon_notify +listening on 127.0.0.1 port PORT_D4 +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv4) port PORT_D2 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) -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) + 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) +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:PORT_D4 port PORT_D (IPv4) port PORT_D2 (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=PORT_D:1226 -DIFACE=local_interfaces = <; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 -listening on all interfaces (IPv4) port 1225 -listening on all interfaces (IPv4) port 1226 -listening on 127.0.0.1 port 1228 +p1237 creating notifier socket +p1237 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv4) port PORT_D2 +listening on 127.0.0.1 port PORT_D4 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 -set_process_info: pppp daemon(x.yz): 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 PORT_D port PORT_D2 [127.0.0.1]:PORT_D4 +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D port PORT_D2 [127.0.0.1]:PORT_D4 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=PORT_D:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.PORT_D4 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 @@ -104,23 +104,23 @@ daemon_smtp_port overridden by -oX: <: 1227 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on 127.0.0.1 port 1228 -listening on all interfaces (IPv4) port 1227 +listening on 127.0.0.1 port PORT_D4 +listening on all interfaces (IPv4) port PORT_D3 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) -set_process_info: pppp daemon(x.yz): 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]:PORT_D4 port PORT_D3 (IPv4) +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:PORT_D4 port PORT_D3 (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=PORT_D:1226 -DIFACE=local_interfaces = <; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 @@ -129,17 +129,17 @@ local_interfaces overridden by -oX: <; 0.0.0.0.1225; 0.0.0.0.1226 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on all interfaces (IPv4) port 1225 -listening on all interfaces (IPv4) port 1226 +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv4) port PORT_D2 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 -set_process_info: pppp daemon(x.yz): 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 PORT_D port PORT_D2 +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D port PORT_D2 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..58f8d8262 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 @@ -11,22 +11,22 @@ daemon_smtp_port overridden by -oX: <: 1225 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on all interfaces (IPv4) port 1225 +listening on all interfaces (IPv4) port PORT_D 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 -set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D 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 @@ -35,22 +35,22 @@ daemon_smtp_port overridden by -oX: <: 1225 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on all interfaces (IPv4) port 1225 +listening on all interfaces (IPv4) port PORT_D 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 -set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D 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 @@ -59,16 +59,16 @@ daemon_smtp_port overridden by -oX: <: 1225 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on all interfaces (IPv4) port 1225 +listening on all interfaces (IPv4) port PORT_D 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 -set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 + exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D 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..e502012d8 100644 --- a/test/stderr/0450 +++ b/test/stderr/0450 @@ -18,24 +18,24 @@ getting address for 127.0.0.1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database added 10HmaX-0005vi-00 to queue for 127.0.0.1 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 @@ -47,17 +47,17 @@ no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1112 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D2: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database already listed for 127.0.0.1 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..446305178 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -11,8 +11,8 @@ Considering Ok@localhost Attempting full verification using callout callout cache: no domain record found for localhost callout cache: no address record found for Ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -63,8 +63,8 @@ Considering NOTok@elsewhere Attempting full verification using callout callout cache: no domain record found for elsewhere callout cache: no address record found for NOTok@elsewhere -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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 @@ -99,8 +99,8 @@ Considering NOTok2@elsewhere Attempting full verification using callout callout cache: found domain record for elsewhere callout cache: no address record found for NOTok2@elsewhere -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250 OK @@ -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/0467 b/test/stderr/0467 index 463e4a70e..b2aa2ef56 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -15,8 +15,8 @@ LOG: MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 -Transport port=25 replaced by host-specific port=1224 -Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected +Transport port=25 replaced by host-specific port=PORT_S +Connecting to localhost.test.ex [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-server id @@ -36,6 +36,6 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' LOG: MAIN - => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK" + => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:PORT_S C="250 OK" LOG: MAIN Completed diff --git a/test/stderr/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..7e4d62809 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> @@ -100,6 +100,8 @@ To: random@test.example, qualify & rewrite recipients list address match test: subject=r1@test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' not found in local cache + compiled RE '^.{40,}@*' saved in local cache r1@test.ex in "^.{40,}@*"? no (end of list) address match test: subject=r1@test.ex pattern=*@* test.ex in "*"? yes (matched "*") @@ -125,6 +127,7 @@ qualify & rewrite recipients list lookup failed global rewrite rules address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -239,6 +242,7 @@ rewrite headers random@test.exam **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -421,6 +425,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -602,6 +607,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -783,6 +789,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -964,6 +971,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -1145,6 +1153,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -1326,6 +1335,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -1507,6 +1517,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -1688,6 +1699,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -1869,6 +1881,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -2049,6 +2062,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -2229,6 +2243,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -2409,6 +2424,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -2589,6 +2605,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -2769,6 +2786,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -2949,6 +2967,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -3129,6 +3148,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -3309,6 +3329,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -3489,6 +3510,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -3669,6 +3691,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -3849,6 +3872,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -4029,6 +4053,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -4209,6 +4234,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -4388,6 +4414,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -4567,6 +4594,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -4746,6 +4774,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -4925,6 +4954,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -5104,6 +5134,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -5283,6 +5314,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -5462,6 +5494,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -5641,6 +5674,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -5820,6 +5854,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -5999,6 +6034,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -6178,6 +6214,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -6357,6 +6394,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -6535,6 +6573,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -6713,6 +6752,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -6891,6 +6931,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -7069,6 +7110,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -7247,6 +7289,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -7425,6 +7468,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -7603,6 +7647,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -7781,6 +7826,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -7959,6 +8005,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -8137,6 +8184,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -8315,6 +8363,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -8493,6 +8542,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -8671,6 +8721,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -8848,6 +8899,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -9025,6 +9077,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -9202,6 +9255,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -9379,6 +9433,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -9556,6 +9611,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -9733,6 +9789,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -9910,6 +9967,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -10087,6 +10145,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -10264,6 +10323,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -10441,6 +10501,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -10618,6 +10679,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -10795,6 +10857,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -10971,6 +11034,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -11147,6 +11211,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -11323,6 +11388,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -11499,6 +11565,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -11675,6 +11742,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -11851,6 +11919,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -12027,6 +12096,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -12203,6 +12273,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -12379,6 +12450,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -12555,6 +12627,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -12731,6 +12804,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -12907,6 +12981,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -13083,6 +13158,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -13258,6 +13334,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -13433,6 +13510,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -13608,6 +13686,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -13783,6 +13862,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -13958,6 +14038,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -14133,6 +14214,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -14308,6 +14390,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -14483,6 +14566,7 @@ remainder: random@test.example, random@test.exa **** debug string too long - truncated **** address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -14658,6 +14742,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -14832,6 +14917,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -15005,6 +15091,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -15177,6 +15264,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -15348,6 +15436,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -15518,6 +15607,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -15687,6 +15777,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -15855,6 +15946,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -16022,6 +16114,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -16188,6 +16281,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -16353,6 +16447,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -16517,6 +16612,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -16680,6 +16776,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -16842,6 +16939,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17003,6 +17101,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17163,6 +17262,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17322,6 +17422,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17480,6 +17581,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17637,6 +17739,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17793,6 +17896,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -17948,6 +18052,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -18102,6 +18207,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -18255,6 +18361,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -18407,6 +18514,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -18558,6 +18666,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -18708,6 +18817,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -18857,6 +18967,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19005,6 +19116,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19152,6 +19264,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19298,6 +19411,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19443,6 +19557,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19587,6 +19702,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19730,6 +19846,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -19872,6 +19989,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20013,6 +20131,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20153,6 +20272,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20292,6 +20412,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20430,6 +20551,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20567,6 +20689,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20703,6 +20826,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20838,6 +20962,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -20972,6 +21097,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21105,6 +21231,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21237,6 +21364,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21368,6 +21496,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21498,6 +21627,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21627,6 +21757,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21755,6 +21886,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -21882,6 +22014,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22008,6 +22141,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22133,6 +22267,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22257,6 +22392,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22380,6 +22516,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22502,6 +22639,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22623,6 +22761,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22743,6 +22882,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22862,6 +23002,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -22980,6 +23121,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23097,6 +23239,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23213,6 +23356,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23328,6 +23472,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23442,6 +23587,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23555,6 +23701,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23667,6 +23814,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23778,6 +23926,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23888,6 +24037,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -23997,6 +24147,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24105,6 +24256,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24212,6 +24364,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24318,6 +24471,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24423,6 +24577,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24527,6 +24682,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24630,6 +24786,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24732,6 +24889,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24833,6 +24991,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -24933,6 +25092,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -25032,6 +25192,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -25130,6 +25291,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -25227,6 +25389,7 @@ remainder: random@test.example, random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -25323,6 +25486,7 @@ To: random@rwtest.example, remainder: random@test.example, random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -25418,6 +25582,7 @@ To: random@rwtest.example, **** debug string too long - truncated **** remainder: random@test.example address match test: subject=random@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache random@test.example in "^.{40,}@*"? no (end of list) address match test: subject=random@test.example pattern=*@* test.example in "*"? yes (matched "*") @@ -25515,6 +25680,7 @@ remainder: rewrite_one_header: type=F: From: CALLER_NAME <CALLER@myhost.test.ex> address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -25722,14 +25888,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> @@ -25744,6 +25910,8 @@ To: localpart_with_056_chars_56789012345678901234567890123456@test.example qualify & rewrite recipients list address match test: subject=r2@test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' not found in local cache + compiled RE '^.{40,}@*' saved in local cache r2@test.ex in "^.{40,}@*"? no (end of list) address match test: subject=r2@test.ex pattern=*@* test.ex in "*"? yes (matched "*") @@ -25769,6 +25937,7 @@ qualify & rewrite recipients list lookup failed global rewrite rules address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -25804,6 +25973,7 @@ rewrite headers rewrite_one_header: type=T: To: localpart_with_056_chars_56789012345678901234567890123456@test.example address match test: subject=localpart_with_056_chars_56789012345678901234567890123456@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache localpart_with_056_chars_56789012345678901234567890123456@test.example in "^.{40,}@*"? yes (matched "^.{40,}@*") LOG: address_rewrite MAIN "localpart_with_056_chars_56789012345678901234567890123456@test.example" from to: rewritten as "deny_me@test.example" by rule 1 @@ -25831,6 +26001,7 @@ remainder: rewrite_one_header: type=F: From: CALLER_NAME <CALLER@myhost.test.ex> address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -25882,14 +26053,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> @@ -25904,6 +26075,8 @@ To: localpart_with_236_chars_567890123456789012345678901234567890123456789012345 qualify & rewrite recipients list address match test: subject=r3@test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' not found in local cache + compiled RE '^.{40,}@*' saved in local cache r3@test.ex in "^.{40,}@*"? no (end of list) address match test: subject=r3@test.ex pattern=*@* test.ex in "*"? yes (matched "*") @@ -25929,6 +26102,7 @@ qualify & rewrite recipients list lookup failed global rewrite rules address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -25964,6 +26138,7 @@ rewrite headers rewrite_one_header: type=T: To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example address match test: subject=localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example in "^.{40,}@*"? yes (matched "^.{40,}@*") LOG: address_rewrite MAIN "localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example" from to: rewritten as "deny_me@test.example" by rule 1 @@ -25991,6 +26166,7 @@ remainder: rewrite_one_header: type=F: From: CALLER_NAME <CALLER@myhost.test.ex> address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -26042,14 +26218,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> @@ -26064,6 +26240,8 @@ To: localpart_with_256_chars_567890123456789012345678901234567890123456789012345 qualify & rewrite recipients list address match test: subject=r4@test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' not found in local cache + compiled RE '^.{40,}@*' saved in local cache r4@test.ex in "^.{40,}@*"? no (end of list) address match test: subject=r4@test.ex pattern=*@* test.ex in "*"? yes (matched "*") @@ -26089,6 +26267,7 @@ qualify & rewrite recipients list lookup failed global rewrite rules address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -26126,14 +26305,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> @@ -26148,6 +26327,8 @@ To: undisclosed recpients:; qualify & rewrite recipients list address match test: subject=r5@test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' not found in local cache + compiled RE '^.{40,}@*' saved in local cache r5@test.ex in "^.{40,}@*"? no (end of list) address match test: subject=r5@test.ex pattern=*@* test.ex in "*"? yes (matched "*") @@ -26173,6 +26354,7 @@ qualify & rewrite recipients list lookup failed global rewrite rules address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -26210,6 +26392,7 @@ rewrite headers rewrite_one_header: type=F: From: CALLER_NAME <CALLER@myhost.test.ex> address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* + compiled RE '^.{40,}@*' found in local cache CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list) address match test: subject=CALLER@myhost.test.ex pattern=*@* myhost.test.ex in "*"? yes (matched "*") @@ -26260,4 +26443,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..21de8a28f 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -11,8 +11,8 @@ Considering r11@two.test.ex Attempting full verification using callout callout cache: found domain record for two.test.ex callout cache: no address record found for r11@two.test.ex -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name SMTP<< 250 OK @@ -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 @@ -43,8 +43,8 @@ Considering r11@two.test.ex Attempting full verification using callout callout cache: found domain record for two.test.ex callout cache: no address record found for r11@two.test.ex -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(Connection timed out)<< SMTP(close)>> cmdlog: '(unset)' @@ -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..ce5143458 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 @@ -18,7 +18,7 @@ checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name cmd buf flush ddd bytes @@ -85,11 +85,11 @@ checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name) set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database added 10HmaZ-0005vi-00 to queue for 127.0.0.1 @@ -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..e54ebb17e 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 @@ -15,10 +15,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -26,10 +26,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -37,10 +37,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -48,10 +48,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 reached transport hosts_max_try limit 1 all IP addresses skipped or deferred at least one address updating wait-t1 database @@ -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 @@ -103,10 +103,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) getting address for 127.0.0.1 checking status of 127.0.0.1 @@ -114,10 +114,10 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 temporary delivery error(s) override hosts_max_try (message older than host's retry time) reached transport hosts_max_try_hardlimit limit 2 all IP addresses skipped or deferred at least one address @@ -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/0525 b/test/stderr/0525 index 8ed331d62..efa09eb19 100644 --- a/test/stderr/0525 +++ b/test/stderr/0525 @@ -3,7 +3,7 @@ LOG: smtp_connection MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss delivering 10HmaX-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Welcome SMTP>> EHLO myhost.test.ex SMTP<< 250 Hi diff --git a/test/stderr/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..2d9f129c0 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -363,6 +363,9 @@ LOG: MAIN ├considering: } }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} ├──expanding: (?i)bulk|list|junk ╰─────result: (?i)bulk|list|junk + compiled RE '(?i)bulk|list|junk' not found in local cache + compiling RE '(?i)bulk|list|junk' + compiled RE '(?i)bulk|list|junk' saved in local cache ╭considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} ├considering: }{(?i)auto-generated|auto-replied} }} {no}{yes}} ├──expanding: $h_auto-submitted: @@ -372,6 +375,9 @@ LOG: MAIN ├considering: } }} {no}{yes}} ├──expanding: (?i)auto-generated|auto-replied ╰─────result: (?i)auto-generated|auto-replied + compiled RE '(?i)auto-generated|auto-replied' not found in local cache + compiling RE '(?i)auto-generated|auto-replied' + compiled RE '(?i)auto-generated|auto-replied' saved in local cache ├──condition: 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} }} ├─────result: false ╭───scanning: no}{yes}} @@ -387,8 +393,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 +458,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..51166675c 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -11,8 +11,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: no domain record found for localhost callout cache: no address record found for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -62,8 +62,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN REJECT H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused created log directory TESTSUITE/spool/log @@ -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 @@ -85,8 +85,8 @@ Considering bad@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: no address record found for bad@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -144,8 +144,8 @@ Considering ok@localhost Attempting full verification using callout callout cache: found domain record for localhost callout cache: address record expired for ok@localhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -201,8 +201,8 @@ Considering ok@otherhost Attempting full verification using callout callout cache: no domain record found for otherhost callout cache: no address record found for ok@otherhost -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -266,8 +266,8 @@ Considering ok@otherhost2 Attempting full verification using callout callout cache: no domain record found for otherhost2 callout cache: no address record found for ok@otherhost2 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -325,8 +325,8 @@ Considering ok@otherhost3 Attempting full verification using callout callout cache: no domain record found for otherhost3 callout cache: no address record found for ok@otherhost3 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -378,8 +378,8 @@ Considering ok@otherhost4 Attempting full verification using callout callout cache: no domain record found for otherhost4 callout cache: no address record found for ok@otherhost4 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -431,8 +431,8 @@ Considering ok@otherhost41 Attempting full verification using callout callout cache: no domain record found for otherhost41 callout cache: no address record found for ok@otherhost41 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -497,8 +497,8 @@ Considering ok@otherhost21 Attempting full verification using callout callout cache: no domain record found for otherhost21 callout cache: no address record found for ok@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -539,8 +539,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost21 callout cache: domain accepts RCPT TO:<postmaster@domain> callout cache: no address record found for ok2@otherhost21 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -573,8 +573,8 @@ Considering ok@otherhost31 Attempting full verification using callout callout cache: no domain record found for otherhost31 callout cache: no address record found for ok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -614,8 +614,8 @@ Attempting full verification using callout callout cache: found domain record for otherhost31 callout cache: domain rejects random addresses callout cache: no address record found for okok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -648,8 +648,8 @@ Considering okokok@otherhost31 Attempting full verification using callout callout cache: domain record expired for otherhost31 callout cache: no address record found for okokok@otherhost31 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -688,8 +688,8 @@ Considering okok@otherhost51 Attempting full verification using callout callout cache: no domain record found for otherhost51 callout cache: no address record found for okok@otherhost51 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -724,8 +724,8 @@ Considering okokok@otherhost52 Attempting full verification using callout callout cache: no domain record found for otherhost52 callout cache: no address record found for okokok@otherhost52 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -766,8 +766,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: no domain record found for x.y.z callout cache: no address record found for abcd@x.y.z/<somesender@a.domain> -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -803,8 +803,8 @@ Considering abcd@x.y.z Attempting full verification using callout callout cache: found domain record for x.y.z callout cache: no address record found for abcd@x.y.z -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -837,8 +837,8 @@ Considering ok@otherhost9 Attempting full verification using callout callout cache: no domain record found for otherhost9 callout cache: no address record found for ok@otherhost9 -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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 @@ -880,8 +880,8 @@ Considering z@test.ex Attempting full verification using callout callout cache: no domain record found for test.ex callout cache: no address record found for z@test.ex/<postmaster@myhost.test.ex> -interface=NULL port=1224 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +interface=NULL port=PORT_S +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-Yeah mate @@ -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..71f78c4de 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 PORT_D +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 PORT_D +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..9c76ebb6e 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -17,7 +17,7 @@ getting address for 127.0.0.1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -55,13 +55,13 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:451:221' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == 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 @@ -83,7 +83,7 @@ no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmbA-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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 @@ -149,7 +149,7 @@ no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmbB-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -187,10 +187,10 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == 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/0632 b/test/stderr/0632 new file mode 100644 index 000000000..eca5a279e --- /dev/null +++ b/test/stderr/0632 @@ -0,0 +1,908 @@ + +******** SERVER ******** +Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid +daemon_smtp_port overridden by -oX: + <: 1225 +creating notifier socket + ╭considering: $spool_directory/exim_daemon_notify + ├considering: /exim_daemon_notify + ├───────text: /exim_daemon_notify + ├──expanding: $spool_directory/exim_daemon_notify + ╰─────result: TESTSUITE/spool/exim_daemon_notify + TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv6) port PORT_D +listening on all interfaces (IPv4) port PORT_D +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 PORT_D +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 +search_tidyup called +p1235 Process p1235 is handling incoming connection from [127.0.0.1] +p1235 ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full +p1235 ├considering: ESMTP Exim $version_number $tod_full +p1235 ├───────text: ESMTP Exim +p1235 ├considering: $version_number $tod_full +p1235 ├considering: $tod_full +p1235 ├───────text: +p1235 ├considering: $tod_full +p1235 ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full +p1235 ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +p1235 Process p1235 is ready for new message +p1235 compiled caseless RE '^nomatch_list' not found in local cache +p1235 compiled RE '^nomatch_list' saved in local cache +p1235 sending RE '^nomatch_list' to daemon +p1235 ╭considering: $spool_directory/exim_daemon_notify +p1235 ├considering: /exim_daemon_notify +p1235 ├───────text: /exim_daemon_notify +p1235 ├──expanding: $spool_directory/exim_daemon_notify +p1235 ╰─────result: TESTSUITE/spool/exim_daemon_notify +p1235 ╭considering: ${if match {a_random_string} {static_RE}} +p1235 ╭considering: a_random_string} {static_RE}} +p1235 ├───────text: a_random_string +p1235 ├considering: } {static_RE}} +p1235 ├──expanding: a_random_string +p1235 ╰─────result: a_random_string +p1235 ╭considering: static_RE}} +p1235 ├───────text: static_RE +p1235 ├considering: }} +p1235 ├──expanding: static_RE +p1235 ╰─────result: static_RE +p1235 compiled RE 'static_RE' not found in local cache +p1235 compiling RE 'static_RE' +p1235 compiled RE 'static_RE' saved in local cache +p1235 sending RE 'static_RE' to daemon +p1235 ╭considering: $spool_directory/exim_daemon_notify +p1235 ├considering: /exim_daemon_notify +p1235 ├───────text: /exim_daemon_notify +p1235 ├──expanding: $spool_directory/exim_daemon_notify +p1235 ╰─────result: TESTSUITE/spool/exim_daemon_notify +p1235 ├──condition: match {a_random_string} {static_RE} +p1235 ├─────result: false +p1235 ├──expanding: ${if match {a_random_string} {static_RE}} +p1235 ╰─────result: +p1235 ╭considering: ${if match {a_random_string} {tricky_static_RE\$}} +p1235 ╭considering: a_random_string} {tricky_static_RE\$}} +p1235 ├───────text: a_random_string +p1235 ├considering: } {tricky_static_RE\$}} +p1235 ├──expanding: a_random_string +p1235 ╰─────result: a_random_string +p1235 ╭considering: tricky_static_RE\$}} +p1235 ├───────text: tricky_static_RE +p1235 ├considering: \$}} +p1235 ├backslashed: '\$' +p1235 ├considering: }} +p1235 ├──expanding: tricky_static_RE\$ +p1235 ╰─────result: tricky_static_RE$ +p1235 compiled RE 'tricky_static_RE$' not found in local cache +p1235 compiling RE 'tricky_static_RE$' +p1235 compiled RE 'tricky_static_RE$' saved in local cache +p1235 sending RE 'tricky_static_RE$' to daemon +p1235 ╭considering: $spool_directory/exim_daemon_notify +p1235 ├considering: /exim_daemon_notify +p1235 ├───────text: /exim_daemon_notify +p1235 ├──expanding: $spool_directory/exim_daemon_notify +p1235 ╰─────result: TESTSUITE/spool/exim_daemon_notify +p1235 ├──condition: match {a_random_string} {tricky_static_RE\$} +p1235 ├─────result: false +p1235 ├──expanding: ${if match {a_random_string} {tricky_static_RE\$}} +p1235 ╰─────result: +p1235 ╭considering: ${if match {a_random_string} {pid=${pid} uncacheable_RE}} +p1235 ╭considering: a_random_string} {pid=${pid} uncacheable_RE}} +p1235 ├───────text: a_random_string +p1235 ├considering: } {pid=${pid} uncacheable_RE}} +p1235 ├──expanding: a_random_string +p1235 ╰─────result: a_random_string +p1235 ╭considering: pid=${pid} uncacheable_RE}} +p1235 ├───────text: pid= +p1235 ├considering: ${pid} uncacheable_RE}} +p1235 ├considering: uncacheable_RE}} +p1235 ├───────text: uncacheable_RE +p1235 ├considering: }} +p1235 ├──expanding: pid=${pid} uncacheable_RE +p1235 ╰─────result: pid=p1235 uncacheable_RE +p1235 compiling RE 'pid=p1235 uncacheable_RE' +p1235 ├──condition: match {a_random_string} {pid=${pid} uncacheable_RE} +p1235 ├─────result: false +p1235 ├──expanding: ${if match {a_random_string} {pid=${pid} uncacheable_RE}} +p1235 ╰─────result: +p1235 search_tidyup called +p1235 search_tidyup called +p1235 ╭considering: ${tod_full} +p1235 ├──expanding: ${tod_full} +p1235 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +p1235 ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost +p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: Received: +p1235 ├considering: ${if def:sender_rcvhost {from $sender_rcvhost +p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:sender_rcvhost +p1235 ├─────result: true +p1235 ╭considering: from $sender_rcvhost +p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: from +p1235 ├considering: $sender_rcvhost +p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├considering: +p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: +p1235 +p1235 ├considering: }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: from $sender_rcvhost +p1235 +p1235 ╰─────result: from [127.0.0.1] (helo=test.ex) +p1235 +p1235 ╰──(tainted) +p1235 ╭───scanning: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:sender_ident +p1235 ├─────result: false +p1235 ╭───scanning: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: from +p1235 ├───scanning: ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ╎╭───scanning: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 ╎ }}(Exim $version_number) +p1235 ╎ ${if def:sender_address {(envelope-from <$sender_address>) +p1235 ╎ }}id $message_exim_id${if def:received_for { +p1235 ╎ for $received_for}} +p1235 ╎├───scanning: } }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 ╎ }}(Exim $version_number) +p1235 ╎ ${if def:sender_address {(envelope-from <$sender_address>) +p1235 ╎ }}id $message_exim_id${if def:received_for { +p1235 ╎ for $received_for}} +p1235 ╎├──expanding: $sender_ident +p1235 ╎├─────result: +p1235 ╎╰───skipping: result is not used +p1235 ├───scanning: }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: +p1235 ├───scanning: }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: from ${quote_local_part:$sender_ident} +p1235 ├─────result: from +p1235 ╰───skipping: result is not used +p1235 ├───item-res: +p1235 ├───scanning: ${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:sender_helo_name +p1235 ├─────result: false +p1235 ╭───scanning: (helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: (helo= +p1235 ├───scanning: $sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───scanning: ) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: ) +p1235 +p1235 ├───scanning: }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: (helo=$sender_helo_name) +p1235 +p1235 ├─────result: (helo=) +p1235 +p1235 ╰───skipping: result is not used +p1235 ├───item-res: +p1235 ├───scanning: }}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }} +p1235 ├─────result: +p1235 ╰───skipping: result is not used +p1235 ├───item-res: from [127.0.0.1] (helo=test.ex) +p1235 +p1235 ╰──(tainted) +p1235 ├considering: by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: by +p1235 ├considering: $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├considering: ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: +p1235 ├considering: ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:received_protocol +p1235 ├─────result: true +p1235 ╭considering: with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: with +p1235 ├considering: $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├considering: }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: +p1235 ├considering: }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: with $received_protocol +p1235 ╰─────result: with smtp +p1235 ├───item-res: with smtp +p1235 ╰──(tainted) +p1235 ├considering: ${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: ($tls_in_ver) +p1235 ├─────result: () +p1235 ╰───skipping: result is not used +p1235 ├───item-res: +p1235 ╰──(tainted) +p1235 ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:tls_in_cipher_std +p1235 ├─────result: false +p1235 ╭───scanning: tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: tls +p1235 ├───scanning: $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───scanning: +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: +p1235 +p1235 ├───scanning: }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: tls $tls_in_cipher_std +p1235 +p1235 ├─────result: tls +p1235 +p1235 ╰───skipping: result is not used +p1235 ├───item-res: +p1235 ╰──(tainted) +p1235 ├considering: (Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: (Exim +p1235 ├considering: $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├considering: ) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: ) +p1235 +p1235 ├considering: ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:sender_address +p1235 ├─────result: true +p1235 ╭considering: (envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: (envelope-from < +p1235 ├considering: $sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├considering: >) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: >) +p1235 +p1235 ├considering: }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├──expanding: (envelope-from <$sender_address>) +p1235 +p1235 ╰─────result: (envelope-from <CALLER@test.ex>) +p1235 +p1235 ╰──(tainted) +p1235 ├───item-res: (envelope-from <CALLER@test.ex>) +p1235 +p1235 ╰──(tainted) +p1235 ├considering: id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├───────text: id +p1235 ├considering: $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ├considering: ${if def:received_for { +p1235 for $received_for}} +p1235 ├──condition: def:received_for +p1235 ├─────result: true +p1235 ╭considering: +p1235 for $received_for}} +p1235 ├───────text: +p1235 for +p1235 ├considering: $received_for}} +p1235 ├considering: }} +p1235 ├──expanding: +p1235 for $received_for +p1235 ╰─────result: +p1235 for dest_1@test.ex +p1235 ╰──(tainted) +p1235 ├───item-res: +p1235 for dest_1@test.ex +p1235 ╰──(tainted) +p1235 ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost +p1235 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1235 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1235 }}(Exim $version_number) +p1235 ${if def:sender_address {(envelope-from <$sender_address>) +p1235 }}id $message_exim_id${if def:received_for { +p1235 for $received_for}} +p1235 ╰─────result: Received: from [127.0.0.1] (helo=test.ex) +p1235 by myhost.test.ex with smtp (Exim x.yz) +p1235 (envelope-from <CALLER@test.ex>) +p1235 id 10HmaX-0005vi-00 +p1235 for dest_1@test.ex +p1235 ╰──(tainted) +p1235 ╭considering: ${tod_full} +p1235 ├──expanding: ${tod_full} +p1235 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +LOG: MAIN + <= CALLER@test.ex H=(test.ex) [127.0.0.1] P=smtp S=sss +search_tidyup called +Process p1235 is ready for new message +LOG: smtp_connection MAIN + SMTP connection from (test.ex) [127.0.0.1] closed by QUIT +p1234 1 SMTP accept process running +p1234 Listening... +p1234 daemon_notification from addr '' +p1234 compiled caseless RE '^nomatch_list' not found in local cache +p1234 compiling caseless RE '^nomatch_list' +p1234 compiled RE '^nomatch_list' saved in local cache +p1234 Listening... +p1234 daemon_notification from addr '' +p1234 compiled RE 'static_RE' not found in local cache +p1234 compiling RE 'static_RE' +p1234 compiled RE 'static_RE' saved in local cache +p1234 Listening... +p1234 daemon_notification from addr '' +p1234 compiled RE 'tricky_static_RE$' not found in local cache +p1234 compiling RE 'tricky_static_RE$' +p1234 compiled RE 'tricky_static_RE$' saved in local cache +p1234 Listening... +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> +p1234 child p1235 ended: status=0x0 +p1234 normal exit, 0 +p1234 0 SMTP accept processes now running +p1234 Listening... +p1234 Connection request from 127.0.0.1 port sssss +p1234 search_tidyup called +p1236 Process p1236 is handling incoming connection from [127.0.0.1] +p1236 ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full +p1236 ├considering: ESMTP Exim $version_number $tod_full +p1236 ├───────text: ESMTP Exim +p1236 ├considering: $version_number $tod_full +p1236 ├considering: $tod_full +p1236 ├───────text: +p1236 ├considering: $tod_full +p1236 ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full +p1236 ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +p1236 Process p1236 is ready for new message +p1236 compiled caseless RE '^nomatch_list' found in local cache +p1236 ╭considering: ${if match {a_random_string} {static_RE}} +p1236 ╭considering: a_random_string} {static_RE}} +p1236 ├───────text: a_random_string +p1236 ├considering: } {static_RE}} +p1236 ├──expanding: a_random_string +p1236 ╰─────result: a_random_string +p1236 ╭considering: static_RE}} +p1236 ├───────text: static_RE +p1236 ├considering: }} +p1236 ├──expanding: static_RE +p1236 ╰─────result: static_RE +p1236 compiled RE 'static_RE' found in local cache +p1236 ├──condition: match {a_random_string} {static_RE} +p1236 ├─────result: false +p1236 ├──expanding: ${if match {a_random_string} {static_RE}} +p1236 ╰─────result: +p1236 ╭considering: ${if match {a_random_string} {tricky_static_RE\$}} +p1236 ╭considering: a_random_string} {tricky_static_RE\$}} +p1236 ├───────text: a_random_string +p1236 ├considering: } {tricky_static_RE\$}} +p1236 ├──expanding: a_random_string +p1236 ╰─────result: a_random_string +p1236 ╭considering: tricky_static_RE\$}} +p1236 ├───────text: tricky_static_RE +p1236 ├considering: \$}} +p1236 ├backslashed: '\$' +p1236 ├considering: }} +p1236 ├──expanding: tricky_static_RE\$ +p1236 ╰─────result: tricky_static_RE$ +p1236 compiled RE 'tricky_static_RE$' found in local cache +p1236 ├──condition: match {a_random_string} {tricky_static_RE\$} +p1236 ├─────result: false +p1236 ├──expanding: ${if match {a_random_string} {tricky_static_RE\$}} +p1236 ╰─────result: +p1236 ╭considering: ${if match {a_random_string} {pid=${pid} uncacheable_RE}} +p1236 ╭considering: a_random_string} {pid=${pid} uncacheable_RE}} +p1236 ├───────text: a_random_string +p1236 ├considering: } {pid=${pid} uncacheable_RE}} +p1236 ├──expanding: a_random_string +p1236 ╰─────result: a_random_string +p1236 ╭considering: pid=${pid} uncacheable_RE}} +p1236 ├───────text: pid= +p1236 ├considering: ${pid} uncacheable_RE}} +p1236 ├considering: uncacheable_RE}} +p1236 ├───────text: uncacheable_RE +p1236 ├considering: }} +p1236 ├──expanding: pid=${pid} uncacheable_RE +p1236 ╰─────result: pid=p1236 uncacheable_RE +p1236 compiling RE 'pid=p1236 uncacheable_RE' +p1236 ├──condition: match {a_random_string} {pid=${pid} uncacheable_RE} +p1236 ├─────result: false +p1236 ├──expanding: ${if match {a_random_string} {pid=${pid} uncacheable_RE}} +p1236 ╰─────result: +p1236 search_tidyup called +p1236 search_tidyup called +p1236 ╭considering: ${tod_full} +p1236 ├──expanding: ${tod_full} +p1236 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +p1236 ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost +p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: Received: +p1236 ├considering: ${if def:sender_rcvhost {from $sender_rcvhost +p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:sender_rcvhost +p1236 ├─────result: true +p1236 ╭considering: from $sender_rcvhost +p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: from +p1236 ├considering: $sender_rcvhost +p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├considering: +p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: +p1236 +p1236 ├considering: }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: from $sender_rcvhost +p1236 +p1236 ╰─────result: from [127.0.0.1] (helo=test.ex) +p1236 +p1236 ╰──(tainted) +p1236 ╭───scanning: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:sender_ident +p1236 ├─────result: false +p1236 ╭───scanning: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: from +p1236 ├───scanning: ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ╎╭───scanning: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 ╎ }}(Exim $version_number) +p1236 ╎ ${if def:sender_address {(envelope-from <$sender_address>) +p1236 ╎ }}id $message_exim_id${if def:received_for { +p1236 ╎ for $received_for}} +p1236 ╎├───scanning: } }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 ╎ }}(Exim $version_number) +p1236 ╎ ${if def:sender_address {(envelope-from <$sender_address>) +p1236 ╎ }}id $message_exim_id${if def:received_for { +p1236 ╎ for $received_for}} +p1236 ╎├──expanding: $sender_ident +p1236 ╎├─────result: +p1236 ╎╰───skipping: result is not used +p1236 ├───scanning: }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: +p1236 ├───scanning: }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: from ${quote_local_part:$sender_ident} +p1236 ├─────result: from +p1236 ╰───skipping: result is not used +p1236 ├───item-res: +p1236 ├───scanning: ${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:sender_helo_name +p1236 ├─────result: false +p1236 ╭───scanning: (helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: (helo= +p1236 ├───scanning: $sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───scanning: ) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: ) +p1236 +p1236 ├───scanning: }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: (helo=$sender_helo_name) +p1236 +p1236 ├─────result: (helo=) +p1236 +p1236 ╰───skipping: result is not used +p1236 ├───item-res: +p1236 ├───scanning: }}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }} +p1236 ├─────result: +p1236 ╰───skipping: result is not used +p1236 ├───item-res: from [127.0.0.1] (helo=test.ex) +p1236 +p1236 ╰──(tainted) +p1236 ├considering: by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: by +p1236 ├considering: $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├considering: ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: +p1236 ├considering: ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:received_protocol +p1236 ├─────result: true +p1236 ╭considering: with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: with +p1236 ├considering: $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├considering: }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: +p1236 ├considering: }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: with $received_protocol +p1236 ╰─────result: with smtp +p1236 ├───item-res: with smtp +p1236 ╰──(tainted) +p1236 ├considering: ${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: ($tls_in_ver) +p1236 ├─────result: () +p1236 ╰───skipping: result is not used +p1236 ├───item-res: +p1236 ╰──(tainted) +p1236 ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:tls_in_cipher_std +p1236 ├─────result: false +p1236 ╭───scanning: tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: tls +p1236 ├───scanning: $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───scanning: +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: +p1236 +p1236 ├───scanning: }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: tls $tls_in_cipher_std +p1236 +p1236 ├─────result: tls +p1236 +p1236 ╰───skipping: result is not used +p1236 ├───item-res: +p1236 ╰──(tainted) +p1236 ├considering: (Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: (Exim +p1236 ├considering: $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├considering: ) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: ) +p1236 +p1236 ├considering: ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:sender_address +p1236 ├─────result: true +p1236 ╭considering: (envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: (envelope-from < +p1236 ├considering: $sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├considering: >) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: >) +p1236 +p1236 ├considering: }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├──expanding: (envelope-from <$sender_address>) +p1236 +p1236 ╰─────result: (envelope-from <CALLER@test.ex>) +p1236 +p1236 ╰──(tainted) +p1236 ├───item-res: (envelope-from <CALLER@test.ex>) +p1236 +p1236 ╰──(tainted) +p1236 ├considering: id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├───────text: id +p1236 ├considering: $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ├considering: ${if def:received_for { +p1236 for $received_for}} +p1236 ├──condition: def:received_for +p1236 ├─────result: true +p1236 ╭considering: +p1236 for $received_for}} +p1236 ├───────text: +p1236 for +p1236 ├considering: $received_for}} +p1236 ├considering: }} +p1236 ├──expanding: +p1236 for $received_for +p1236 ╰─────result: +p1236 for dest_2@test.ex +p1236 ╰──(tainted) +p1236 ├───item-res: +p1236 for dest_2@test.ex +p1236 ╰──(tainted) +p1236 ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost +p1236 }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) +p1236 }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std +p1236 }}(Exim $version_number) +p1236 ${if def:sender_address {(envelope-from <$sender_address>) +p1236 }}id $message_exim_id${if def:received_for { +p1236 for $received_for}} +p1236 ╰─────result: Received: from [127.0.0.1] (helo=test.ex) +p1236 by myhost.test.ex with smtp (Exim x.yz) +p1236 (envelope-from <CALLER@test.ex>) +p1236 id 10HmaY-0005vi-00 +p1236 for dest_2@test.ex +p1236 ╰──(tainted) +p1236 ╭considering: ${tod_full} +p1236 ├──expanding: ${tod_full} +p1236 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +LOG: MAIN + <= CALLER@test.ex H=(test.ex) [127.0.0.1] P=smtp S=sss +search_tidyup called +Process p1236 is ready for new message +LOG: smtp_connection MAIN + SMTP connection from (test.ex) [127.0.0.1] closed by QUIT +p1234 1 SMTP accept process running +p1234 Listening... +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1236 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>> +p1234 child p1236 ended: status=0x0 +p1234 normal exit, 0 +p1234 0 SMTP accept processes now running +p1234 Listening... +p1234 SIGTERM/SIGINT seen +p1234 search_tidyup called +p1234 >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0911 b/test/stderr/0911 index 2f78100f1..5bd87540c 100644 --- a/test/stderr/0911 +++ b/test/stderr/0911 @@ -21,7 +21,7 @@ getting address for 127.0.0.1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (good@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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 @@ -87,7 +87,7 @@ getting address for 127.0.0.1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (nopipe@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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 @@ -152,7 +152,7 @@ getting address for 127.0.0.1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -189,15 +189,15 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:451:221' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == 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 @@ -222,7 +222,7 @@ no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmbA-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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 @@ -292,7 +292,7 @@ no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmbB-0005vi-00 to 127.0.0.1 [127.0.0.1] (dataloss@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -329,12 +329,12 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250' -added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN == 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..ceb19161b 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -2,130 +2,130 @@ ******** 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 -listening on all interfaces (IPv6) port 1225 -listening on all interfaces (IPv4) port 1225 +p1234 creating notifier socket +p1234 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv6) port PORT_D +listening on all interfaces (IPv4) port PORT_D 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) -set_process_info: pppp daemon(x.yz): 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 PORT_D (IPv6 and IPv4) +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D (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=PORT_D -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 -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 +p1235 creating notifier socket +p1235 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv6) port PORT_D +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv6) port PORT_D2 +listening on all interfaces (IPv4) port PORT_D2 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) -set_process_info: pppp daemon(x.yz): 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 PORT_D (IPv6 and IPv4) port PORT_D2 (IPv6 and IPv4) +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (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=PORT_D:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 -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 -listening on 127.0.0.1 port 1228 +p1236 creating notifier socket +p1236 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv6) port PORT_D +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv6) port PORT_D2 +listening on all interfaces (IPv4) port PORT_D2 +listening on 127.0.0.1 port PORT_D4 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 -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 + 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 +set_process_info: pppp daemon(x.yz): 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 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=PORT_D:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 -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 -listening on 127.0.0.1 port 1228 +p1237 creating notifier socket +p1237 @TESTSUITE/spool/exim_daemon_notify +listening on all interfaces (IPv6) port PORT_D +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv6) port PORT_D2 +listening on all interfaces (IPv4) port PORT_D2 +listening on 127.0.0.1 port PORT_D4 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 -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 + 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 +set_process_info: pppp daemon(x.yz): 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 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=PORT_D:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.PORT_D4 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 -listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 -listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1226 +p1238 creating notifier socket +p1238 @TESTSUITE/spool/exim_daemon_notify +listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port PORT_D +listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port PORT_D2 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=PORT_D:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 @@ -134,24 +134,24 @@ daemon_smtp_port overridden by -oX: <: 1227 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on all interfaces (IPv6) port 1227 -listening on all interfaces (IPv4) port 1227 -listening on 127.0.0.1 port 1228 +listening on all interfaces (IPv6) port PORT_D3 +listening on all interfaces (IPv4) port PORT_D3 +listening on 127.0.0.1 port PORT_D4 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 -set_process_info: pppp daemon(x.yz): 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 PORT_D3 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D3 (IPv6 and IPv4) [127.0.0.1]:PORT_D4 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=PORT_D:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 @@ -162,23 +162,23 @@ local_interfaces overridden by -oX: <; 127.0.0.1 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on 127.0.0.1 port 1227 -listening on 127.0.0.1 port 1225 +listening on 127.0.0.1 port PORT_D3 +listening on 127.0.0.1 port PORT_D 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=PORT_D:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.PORT_D4 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=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 @@ -187,18 +187,18 @@ local_interfaces overridden by -oX: <; ::0.1225; 0.0.0.0.1225; 0.0.0.0.1226 creating notifier socket TESTSUITE/spool/exim_daemon_notify -listening on all interfaces (IPv6) port 1225 -listening on all interfaces (IPv4) port 1225 -listening on all interfaces (IPv4) port 1226 +listening on all interfaces (IPv6) port PORT_D +listening on all interfaces (IPv4) port PORT_D +listening on all interfaces (IPv4) port PORT_D2 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) -set_process_info: pppp daemon(x.yz): 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 PORT_D (IPv6 and IPv4) port PORT_D2 (IPv4) +set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) port PORT_D2 (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..6da84a2cb 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -1,7 +1,7 @@ LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid pppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + Start queue run: pid=p1234 -qf +delivering 10HmaX-0005vi-00 (queue run pid p1234) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] @@ -35,8 +35,8 @@ 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) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmaY-0005vi-00 (queue run pid p1234) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] @@ -72,7 +72,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=10HmbA-0005vi-00" LOG: MAIN -> 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" -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] @@ -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..5e1ec4d4c 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -3,11 +3,11 @@ 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 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + 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]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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,21 +87,21 @@ 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 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + 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]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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,21 +181,21 @@ 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 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + 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]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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..54b2f44e4 100644 --- a/test/stderr/1160 +++ b/test/stderr/1160 @@ -1,7 +1,7 @@ LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid pppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + Start queue run: pid=p1234 -qf +delivering 10HmaX-0005vi-00 (queue run pid p1234) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] @@ -26,8 +26,8 @@ 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) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +delivering 10HmaY-0005vi-00 (queue run pid p1234) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] @@ -54,7 +54,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=10HmbA-0005vi-00" LOG: MAIN -> 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" -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] @@ -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..3888badbb 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -3,7 +3,7 @@ configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN SMTP connection from CALLER -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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 @@ -47,7 +47,7 @@ dropping to exim gid; retaining priv uid t1 transport entered userb@test.ex hostlist: - '127.0.0.1' IP 127.0.0.1 port 1225 + '127.0.0.1' IP 127.0.0.1 port PORT_D already connected to 127.0.0.1 [127.0.0.1] (on fd 0) checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable @@ -72,10 +72,10 @@ cmd buf flush ddd bytes (more expected) cmdlog: 'DATA:354:.:250:QUIT:221' Leaving t1 transport 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" + => 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" 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..3888badbb 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -3,7 +3,7 @@ configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN SMTP connection from CALLER -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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 @@ -47,7 +47,7 @@ dropping to exim gid; retaining priv uid t1 transport entered userb@test.ex hostlist: - '127.0.0.1' IP 127.0.0.1 port 1225 + '127.0.0.1' IP 127.0.0.1 port PORT_D already connected to 127.0.0.1 [127.0.0.1] (on fd 0) checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable @@ -72,10 +72,10 @@ cmd buf flush ddd bytes (more expected) cmdlog: 'DATA:354:.:250:QUIT:221' Leaving t1 transport 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" + => 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" 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..07b9ac520 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 PORT_D +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 PORT_D +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..5306d8582 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -13,7 +13,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select name from them where id='ph10';" opts=NULL database lookup required for select name from them where id='ph10'; MySQL query: "select name from them where id='ph10';" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" @@ -34,7 +34,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select name from them where id='xxxx';" opts=NULL database lookup required for select name from them where id='xxxx'; MySQL query: "select name from them where id='xxxx';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -47,7 +47,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select name from them where id='nothing';" opts=NULL database lookup required for select name from them where id='nothing'; MySQL query: "select name from them where id='nothing';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: search_open: mysql "NULL" @@ -59,7 +59,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select id,name from them where id='nothing';" opts=NULL database lookup required for select id,name from them where id='nothing'; MySQL query: "select id,name from them where id='nothing';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: id=nothing name="" search_open: mysql "NULL" @@ -71,7 +71,7 @@ dropping to exim gid; retaining priv uid type=mysql key="delete from them where id='nonexist';" opts=NULL database lookup required for delete from them where id='nonexist'; MySQL query: "delete from them where id='nonexist';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: query was not one that returns data lookup forced cache cleanup lookup yielded: 0 @@ -84,7 +84,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='quote';" opts=NULL database lookup required for select * from them where id='quote'; MySQL query: "select * from them where id='quote';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -97,7 +97,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='filter';" opts=NULL database lookup required for select * from them where id='filter'; MySQL query: "select * from them where id='filter';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -110,7 +110,7 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='quote2';" opts=NULL database lookup required for select * from them where id='quote2'; MySQL query: "select * from them where id='quote2';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: name="\"stquot" id=quote2 search_open: mysql "NULL" @@ -122,54 +122,54 @@ dropping to exim gid; retaining priv uid type=mysql key="select * from them where id='nlonly';" opts=NULL database lookup required for select * from them where id='nlonly'; MySQL query: "select * from them where id='nlonly';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" opts=NULL - database lookup required for servers=x:127.0.0.1::1223; select name from them where id='ph10'; - MySQL query: "servers=x:127.0.0.1::1223; select name from them where id='ph10';" opts 'NULL' + type=mysql key="servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" opts=NULL + database lookup required for servers=x:127.0.0.1::PORT_N; select name from them where id='ph10'; + MySQL query: "servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" opts 'NULL' lookup deferred: MySQL server "x" not found in mysql_servers search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=127.0.0.1::1223:x; select name from them where id='ph10'; - MySQL query: "servers=127.0.0.1::1223:x; select name from them where id='ph10';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + type=mysql key="servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N:x; select name from them where id='ph10'; + MySQL query: "servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" opts 'NULL' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10'; - MySQL query: "servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + type=mysql key="servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10'; + MySQL query: "servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" opts 'NULL' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" opts=NULL - database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10'; - MySQL query: "servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" opts 'NULL' - MYSQL new connection: host=ip4.ip4.ip4.ip4 port=1223 socket=NULL database=test user=root + type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" opts=NULL + database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10'; + MySQL query: "servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" opts 'NULL' + MYSQL new connection: host=ip4.ip4.ip4.ip4 port=PORT_N socket=NULL database=test user=root creating new cache entry lookup yielded: Philip Hazel search_open: mysql "NULL" @@ -193,7 +193,7 @@ dropping to exim gid; retaining priv uid type=mysql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa'); MySQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel Aristotle @@ -206,7 +206,7 @@ dropping to exim gid; retaining priv uid type=mysql key="SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT * FROM them WHERE id IN ('ph10', 'aaaa'); MySQL query: "SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: name="Philip Hazel" id=ph10 name=Aristotle id=aaaa @@ -219,22 +219,22 @@ dropping to exim gid; retaining priv uid type=mysql key="delete from them where id='aaaa'" opts=NULL database lookup required for delete from them where id='aaaa' MySQL query: "delete from them where id='aaaa'" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: query was not one that returns data lookup forced cache cleanup lookup yielded: 1 search_tidyup called close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root -close MYSQL connection: 127.0.0.1:1223/test/root ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +close MYSQL connection: 127.0.0.1:PORT_N/test/root +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - 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 @@ -276,7 +276,7 @@ processing "warn" (TESTSUITE/test-config 26) database lookup required for select name from them where id = 'c' (tainted, quoted:mysql) MySQL query: "select name from them where id = 'c'" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root MYSQL: no data found creating new cache entry lookup failed @@ -295,7 +295,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 26): select name from them where id = 'c' search_type NN (mysql) quoting -1 (none) MySQL query: "select name from them where id = 'c'" opts 'no_rd' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found replacing old cache entry lookup failed @@ -306,49 +306,49 @@ processing "warn" (TESTSUITE/test-config 31) search_open: mysql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223/test/root/pass" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N/test/root/pass" LRU list: internal_search_find: file="NULL" - type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223/test/root/pass" + type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::PORT_N/test/root/pass" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:mysql) - MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223/test/root/pass' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223/test/root/pass {select name from them where id = '${quote_mysql:$local_part}'}} +check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::PORT_N/test/root/pass {select name from them where id = '${quote_mysql:$local_part}'}} = ok: search_open: mysql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N" LRU list: internal_search_find: file="NULL" - type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223" + type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::PORT_N" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:mysql) - MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::PORT_N' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223 {select name from them where id = '${quote_mysql:$local_part}'}} +check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::PORT_N {select name from them where id = '${quote_mysql:$local_part}'}} = ok: search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c'" opts=NULL - database lookup required for servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c' + type=mysql key="servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c' (tainted, quoted:mysql) - MySQL query: "servers=127.0.0.1::1223/test/root/pass; select name from them where id = 'c'" opts 'NULL' - lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" opts 'NULL' + lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "warn" (TESTSUITE/test-config 40) check set acl_m0 = ok: hostlist check hosts = net-mysql;select * from them where id='${quote_mysql:$local_part}' @@ -362,7 +362,7 @@ internal_search_find: file="NULL" database lookup required for select * from them where id='c' (tainted, quoted:mysql) MySQL query: "select * from them where id='c'" opts 'NULL' -MYSQL using cached connection for 127.0.0.1:1223/test/root +MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -370,40 +370,40 @@ host in "net-mysql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 43) check set acl_m0 = FAIL: hostlist -check hosts = <& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='${quote_mysql:$local_part}' +check hosts = <& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' search_open: mysql "NULL" cached open search_find: file="NULL" - key="servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'" opts=NULL -database lookup required for servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' + type=mysql key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts=NULL +database lookup required for servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c' (tainted, quoted:mysql) -MySQL query: "servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'" opts 'NULL' -lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted -host in "<& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' +MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts 'NULL' +lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted +host in "<& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "warn" (TESTSUITE/test-config 48) check set acl_m0 = FAIL: hostlist -check hosts = <& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='${quote_mysql:$local_part}' +check hosts = <& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' search_open: mysql "NULL" cached open search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::1223/test/root/pass" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N/test/root/pass" LRU list: internal_search_find: file="NULL" - type=mysql key=" select * from them where id='c'" opts="servers=127.0.0.1::1223/test/root/pass" + type=mysql key=" select * from them where id='c'" opts="servers=127.0.0.1::PORT_N/test/root/pass" database lookup required for select * from them where id='c' (tainted, quoted:mysql) -MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::1223/test/root/pass' -lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted -host in "<& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' +MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' +lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted +host in "<& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "accept" (TESTSUITE/test-config 51) check domains = +local_domains d in "@"? no (end of list) @@ -420,7 +420,7 @@ internal_search_find: file="NULL" type=mysql key="select * from them where id='10.0.0.0'" opts=NULL database lookup required for select * from them where id='10.0.0.0' MySQL query: "select * from them where id='10.0.0.0'" opts 'NULL' -MYSQL using cached connection for 127.0.0.1:1223/test/root +MYSQL using cached connection for 127.0.0.1:PORT_N/test/root MYSQL: no data found creating new cache entry lookup failed @@ -439,15 +439,15 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called -close MYSQL connection: 127.0.0.1:1223/test/root ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +close MYSQL connection: 127.0.0.1:PORT_N/test/root +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - 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 @@ -544,7 +544,7 @@ local_part=ph10 domain=myhost.test.ex database lookup required for select name from them where id='ph10@myhost.test.ex' (tainted, quoted:mysql) MySQL query: "select name from them where id='ph10@myhost.test.ex'" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root MYSQL: no data found creating new cache entry lookup failed @@ -563,7 +563,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (router r1, TESTSUITE/test-config 66): select name from them where id='ph10' search_type NN (mysql) quoting -1 (none) MySQL query: "select name from them where id='ph10'" opts 'NULL' - MYSQL using cached connection for 127.0.0.1:1223/test/root + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel calling r1 router @@ -585,7 +585,7 @@ After routing: Failed addresses: Deferred addresses: search_tidyup called -close MYSQL connection: 127.0.0.1:1223/test/root +close MYSQL connection: 127.0.0.1:PORT_N/test/root >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> ph10@myhost.test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile @@ -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 @@ -612,7 +612,7 @@ LOG: MAIN tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 79): select id from them where id='ph10' search_type NN (mysql) quoting -1 (none) MySQL query: "select id from them where id='ph10'" opts 'NULL' - MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root + MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root creating new cache entry lookup yielded: ph10 appendfile: mode=600 notify_comsat=0 quota=0 warning=0 @@ -632,7 +632,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -close MYSQL connection: 127.0.0.1:1223/test/root +close MYSQL connection: 127.0.0.1:PORT_N/test/root journalling ph10@myhost.test.ex t1 transport returned OK for ph10@myhost.test.ex post-process ph10@myhost.test.ex (0) @@ -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..24c8f77a0 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -14,7 +14,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select name from them where id='ph10';" opts=NULL database lookup required for select name from them where id='ph10'; PostgreSQL query: "select name from them where id='ph10';" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry lookup yielded: Philip Hazel search_open: pgsql "NULL" @@ -35,7 +35,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select name from them where id='xxxx';" opts=NULL database lookup required for select name from them where id='xxxx'; PostgreSQL query: "select name from them where id='xxxx';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found creating new cache entry lookup failed @@ -48,7 +48,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select name from them where id='nothing';" opts=NULL database lookup required for select name from them where id='nothing'; PostgreSQL query: "select name from them where id='nothing';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: search_open: pgsql "NULL" @@ -60,7 +60,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select id,name from them where id='nothing';" opts=NULL database lookup required for select id,name from them where id='nothing'; PostgreSQL query: "select id,name from them where id='nothing';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: id=nothing name="" search_open: pgsql "NULL" @@ -72,7 +72,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="delete from them where id='nonexist';" opts=NULL database lookup required for delete from them where id='nonexist'; PostgreSQL query: "delete from them where id='nonexist';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: command does not return any data but was successful. Rows affected: 0 lookup forced cache cleanup lookup yielded: 0 @@ -85,7 +85,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where id='quote2';" opts=NULL database lookup required for select * from them where id='quote2'; PostgreSQL query: "select * from them where id='quote2';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="\"stquot" id=quote2 search_open: pgsql "NULL" @@ -97,7 +97,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where id='newline';" opts=NULL database lookup required for select * from them where id='newline'; PostgreSQL query: "select * from them where id='newline';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="before
after" id=newline @@ -110,7 +110,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where id='tab';" opts=NULL database lookup required for select * from them where id='tab'; PostgreSQL query: "select * from them where id='tab';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="x x" id=tab search_open: pgsql "NULL" @@ -122,7 +122,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="select * from them where name='''stquot';" opts=NULL database lookup required for select * from them where name='''stquot'; PostgreSQL query: "select * from them where name='''stquot';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name='stquot id=quote1 search_open: pgsql "NULL" @@ -138,25 +138,25 @@ dropping to exim gid; retaining priv uid search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=localhost::1223:x; select name from them where id='ph10'; - PostgreSQL query: "servers=localhost::1223:x; select name from them where id='ph10';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + type=pgsql key="servers=localhost::PORT_N:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=localhost::PORT_N:x; select name from them where id='ph10'; + PostgreSQL query: "servers=localhost::PORT_N:x; select name from them where id='ph10';" opts 'NULL' + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: Philip Hazel search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" opts=NULL - database lookup required for servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10'; - PostgreSQL query: "servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + type=pgsql key="servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" opts=NULL + database lookup required for servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10'; + PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL' + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: Philip Hazel search_open: pgsql "NULL" @@ -180,7 +180,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa'); PostgreSQL query: "SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: Philip Hazel Aristotle @@ -193,7 +193,7 @@ dropping to exim gid; retaining priv uid type=pgsql key="SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts=NULL database lookup required for SELECT * FROM them WHERE id IN ('ph10', 'aaaa'); PostgreSQL query: "SELECT * FROM them WHERE id IN ('ph10', 'aaaa');" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry lookup yielded: name="Philip Hazel" id=ph10 name=Aristotle id=aaaa @@ -206,21 +206,21 @@ dropping to exim gid; retaining priv uid type=pgsql key="delete from them where id='aaaa'" opts=NULL database lookup required for delete from them where id='aaaa' PostgreSQL query: "delete from them where id='aaaa'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: command does not return any data but was successful. Rows affected: 1 lookup forced cache cleanup lookup yielded: 1 search_tidyup called close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER -close PGSQL connection: localhost:1223/test/CALLER ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +close PGSQL connection: localhost:PORT_N/test/CALLER +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - 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 @@ -262,7 +262,7 @@ processing "warn" (TESTSUITE/test-config 27) database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER PGSQL: no data found creating new cache entry lookup failed @@ -281,7 +281,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c' search_type NN (pgsql) quoting -1 (none) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed @@ -292,49 +292,49 @@ processing "warn" (TESTSUITE/test-config 32) search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N/test/CALLER/" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223/test/CALLER/' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N/test/CALLER/' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223 {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts=NULL - database lookup required for servers=localhost::1223/test/CALLER/; select name from them where id = 'c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts=NULL + database lookup required for servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts 'NULL' - lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts 'NULL' + lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 41) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='${quote_pgsql:$local_part}' @@ -348,7 +348,7 @@ internal_search_find: file="NULL" database lookup required for select * from them where id='c' (tainted, quoted:pgsql) PostgreSQL query: "select * from them where id='c'" opts 'NULL' -PGSQL using cached connection for localhost:1223/test/CALLER +PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found creating new cache entry lookup failed @@ -356,40 +356,40 @@ host in "net-pgsql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts=NULL -database lookup required for servers=localhost::1223/test/CALLER/; select * from them where id='c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts=NULL +database lookup required for servers=localhost::PORT_N/test/CALLER/; select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: "servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts 'NULL' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts 'NULL' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 49) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key=" select * from them where id='c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key=" select * from them where id='c'" opts="servers=localhost::PORT_N/test/CALLER/" database lookup required for select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::1223/test/CALLER/' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::PORT_N/test/CALLER/' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "accept" (TESTSUITE/test-config 52) check domains = +local_domains d in "@"? no (end of list) @@ -406,7 +406,7 @@ internal_search_find: file="NULL" type=pgsql key="select * from them where id='10.0.0.0'" opts=NULL database lookup required for select * from them where id='10.0.0.0' PostgreSQL query: "select * from them where id='10.0.0.0'" opts 'NULL' -PGSQL using cached connection for localhost:1223/test/CALLER +PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found creating new cache entry lookup failed @@ -433,7 +433,7 @@ processing "warn" (TESTSUITE/test-config 27) cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed @@ -452,7 +452,7 @@ LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c' search_type NN (pgsql) quoting -1 (none) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' - PGSQL using cached connection for localhost:1223/test/CALLER + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed @@ -463,49 +463,49 @@ processing "warn" (TESTSUITE/test-config 32) search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N/test/CALLER/" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223/test/CALLER/' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N/test/CALLER/' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N/test/CALLER/ {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223" + key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N" LRU list: internal_search_find: file="NULL" - type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223" + type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::PORT_N" cached data found but wrong opts; database lookup required for select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223' - PGSQL using cached connection for localhost:1223/test/CALLER + PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::PORT_N' + PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found replacing old cache entry lookup failed -check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223 {select name from them where id = '${quote_pgsql:$local_part}'}} +check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N {select name from them where id = '${quote_pgsql:$local_part}'}} = ok: search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts=NULL - database lookup required for servers=localhost::1223/test/CALLER/; select name from them where id = 'c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts=NULL + database lookup required for servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c' (tainted, quoted:pgsql) - PostgreSQL query: "servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts 'NULL' - lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts 'NULL' + lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 41) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='${quote_pgsql:$local_part}' @@ -522,40 +522,40 @@ host in "net-pgsql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=pgsql key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts=NULL -database lookup required for servers=localhost::1223/test/CALLER/; select * from them where id='c' + type=pgsql key="servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts=NULL +database lookup required for servers=localhost::PORT_N/test/CALLER/; select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: "servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts 'NULL' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts 'NULL' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "warn" (TESTSUITE/test-config 49) check set acl_m0 = FAIL: hostlist -check hosts = <& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' +check hosts = <& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' search_open: pgsql "NULL" cached open search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::PORT_N/test/CALLER/" LRU list: internal_search_find: file="NULL" - type=pgsql key=" select * from them where id='c'" opts="servers=localhost::1223/test/CALLER/" + type=pgsql key=" select * from them where id='c'" opts="servers=localhost::PORT_N/test/CALLER/" database lookup required for select * from them where id='c' (tainted, quoted:pgsql) -PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::1223/test/CALLER/' -lookup deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted -host in "<& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' +PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::PORT_N/test/CALLER/' +lookup deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted +host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:1223/test/CALLER/" is tainted + H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test/CALLER/" is tainted processing "accept" (TESTSUITE/test-config 52) check domains = +local_domains d in "@"? no (end of list) @@ -587,15 +587,15 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [10.0.0.0] closed by QUIT search_tidyup called -close PGSQL connection: localhost:1223/test/CALLER ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +close PGSQL connection: localhost:PORT_N/test/CALLER +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - 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 @@ -686,7 +686,7 @@ processing address_data type=pgsql key="select name from them where id='ph10'" opts=NULL database lookup required for select name from them where id='ph10' PostgreSQL query: "select name from them where id='ph10'" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry lookup yielded: Philip Hazel calling r1 router @@ -708,7 +708,7 @@ After routing: Failed addresses: Deferred addresses: search_tidyup called -close PGSQL connection: localhost:1223/test/CALLER +close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> CALLER@myhost.test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile @@ -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 @@ -731,7 +731,7 @@ appendfile transport entered type=pgsql key="select id from them where id='ph10'" opts=NULL database lookup required for select id from them where id='ph10' PostgreSQL query: "select id from them where id='ph10'" opts 'NULL' - PGSQL new connection: host=localhost port=1223 database=test user=CALLER + PGSQL new connection: host=localhost port=PORT_N database=test user=CALLER creating new cache entry lookup yielded: ph10 appendfile: mode=600 notify_comsat=0 quota=0 warning=0 @@ -751,7 +751,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -close PGSQL connection: localhost:1223/test/CALLER +close PGSQL connection: localhost:PORT_N/test/CALLER journalling CALLER@myhost.test.ex t1 transport returned OK for CALLER@myhost.test.ex post-process CALLER@myhost.test.ex (0) @@ -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..49e31375a 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 @@ -462,6 +462,9 @@ mylogin authenticator server_condition: $auth1 = userx secret $1 = userx secret +++MYLOGIN $1="userx secret" $2="" $3="" + compiled RE '^(\S+)\s+(\S+)$' not found in local cache + compiling RE '^(\S+)\s+(\S+)$' + compiled RE '^(\S+)\s+(\S+)$' saved in local cache expanded string: yes SMTP>> 235 Authentication succeeded SMTP<< quit @@ -469,4 +472,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/3404 b/test/stderr/3404 index ceb395949..1ba6a2540 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -1,7 +1,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaX-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -30,7 +30,7 @@ LOG: MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaY-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250-OK @@ -59,7 +59,7 @@ LOG: MAIN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250-OK diff --git a/test/stderr/4052 b/test/stderr/4052 index 3c07e0e2c..c8a0c69be 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -13,13 +13,13 @@ dropping to exim gid; retaining priv uid smtp transport entered extchange@test.ex hostlist: - '127.0.0.1' IP 127.0.0.1 port 1225 + '127.0.0.1' IP 127.0.0.1 port PORT_D checking status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex) -Transport port=25 replaced by host-specific port=1225 +Transport port=25 replaced by host-specific port=PORT_D EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000 Using cached cleartext PIPECONNECT SMTP|> EHLO the.local.host.name @@ -29,7 +29,7 @@ not using DSN SMTP|> RCPT TO:<extchange@test.ex> SMTP>> DATA cmd buf flush ddd bytes -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... sending dd nonTFO early-data connected smtp_reap_early_pipe expect banner SMTP<< 220 banner @@ -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..0738f4491 100644 --- a/test/stderr/4510 +++ b/test/stderr/4510 @@ -8,7 +8,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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..35423d58d 100644 --- a/test/stderr/4530 +++ b/test/stderr/4530 @@ -8,7 +8,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes @@ -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..d96971064 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 @@ -130,6 +130,7 @@ created directory TESTSUITE/test-mail/nofile created directory TESTSUITE/test-mail/nofile/tmp created directory TESTSUITE/test-mail/nofile/new created directory TESTSUITE/test-mail/nofile/cur +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/nofile TESTSUITE/test-mail/nofile/maildirsize does not exist: recalculating @@ -164,7 +165,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 +186,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 +238,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 +305,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 @@ -318,6 +319,7 @@ ensuring maildir directories exist in TESTSUITE/test-mail/userx created directory TESTSUITE/test-mail/userx/tmp created directory TESTSUITE/test-mail/userx/new created directory TESTSUITE/test-mail/userx/cur +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx reading quota parameters from maildirsize data @@ -355,7 +357,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 +378,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 +430,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 +497,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 @@ -506,6 +508,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0 maildir_use_size_file=yes de-tainting path 'TESTSUITE/test-mail/userx' ensuring maildir directories exist in TESTSUITE/test-mail/userx +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx reading quota parameters from maildirsize data @@ -540,7 +543,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 +576,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 +628,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 +703,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 @@ -711,6 +714,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0 maildir_use_size_file=yes de-tainting path 'TESTSUITE/test-mail/userx' ensuring maildir directories exist in TESTSUITE/test-mail/userx +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx reading quota parameters from maildirsize data @@ -732,7 +736,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 +769,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..4194360f1 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 @@ -130,6 +130,7 @@ created directory TESTSUITE/test-mail/userx created directory TESTSUITE/test-mail/userx/tmp created directory TESTSUITE/test-mail/userx/new created directory TESTSUITE/test-mail/userx/cur +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx TESTSUITE/test-mail/userx/maildirsize does not exist: recalculating @@ -162,7 +163,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 +184,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/5403 b/test/stderr/5403 index 17296572a..ca16db4fd 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -68,8 +68,8 @@ MUNGED: ::1 will be omitted in what follows >>> routed by all router >>> Attempting full verification using callout >>> callout cache: disabled by no_cache ->>> interface=ip4.ip4.ip4.ip4 port=1224 ->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +>>> interface=ip4.ip4.ip4.ip4 port=PORT_S +>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... connected >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5410 b/test/stderr/5410 index bbde8b873..f4fd5654d 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -66,7 +66,7 @@ domain.com in "! +local_domains"? yes (end of list) ╰─────result: userx ╰──(tainted) domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... connected ╭considering: $primary_hostname ├──expanding: $primary_hostname ╰─────result: myhost.test.ex @@ -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 @@ -553,7 +556,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 @@ -622,7 +625,7 @@ domain.com in "! +local_domains"? yes (end of list) ╰─────result: usery ╰──(tainted) domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... connected ╭considering: $primary_hostname ├──expanding: $primary_hostname ╰─────result: myhost.test.ex @@ -648,6 +651,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 @@ -1070,7 +1076,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 @@ -1139,7 +1145,7 @@ domain.com in "! +local_domains"? yes (end of list) ╰─────result: usery ╰──(tainted) domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... connected ╭considering: $primary_hostname ├──expanding: $primary_hostname ╰─────result: myhost.test.ex @@ -1165,6 +1171,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 @@ -1587,6 +1596,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..2436aa14b 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -66,7 +66,7 @@ domain.com in "! +local_domains"? yes (end of list) ╰─────result: userx ╰──(tainted) domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... connected ╭considering: $primary_hostname ├──expanding: $primary_hostname ╰─────result: myhost.test.ex @@ -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 @@ -623,7 +626,7 @@ domain.com in "! +local_domains"? yes (end of list) ╰─────result: usery ╰──(tainted) domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... connected ╭considering: $primary_hostname ├──expanding: $primary_hostname ╰─────result: myhost.test.ex @@ -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 @@ -1140,7 +1146,7 @@ domain.com in "! +local_domains"? yes (end of list) ╰─────result: usery ╰──(tainted) domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... connected ╭considering: $primary_hostname ├──expanding: $primary_hostname ╰─────result: myhost.test.ex @@ -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/stderr/5820 b/test/stderr/5820 index 53291edf4..053929525 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -22,8 +22,8 @@ >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4") ->>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected +>>> interface=NULL port=PORT_D +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/5840 b/test/stderr/5840 index 93a7bfd2c..6cae7d46e 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -22,8 +22,8 @@ >>> callout cache: no domain record found for dane256ee.test.ex >>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4") ->>> interface=NULL port=1225 ->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected +>>> interface=NULL port=PORT_D +>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ... connected >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex |