X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c5db348c5e29e93e51389fa0079f829967c5da82..8eb8355567a56d3be58aae59741a60824a105110:/test/stderr/0386?ds=sidebyside diff --git a/test/stderr/0386 b/test/stderr/0386 index c24b8725c..2f9b0e2a9 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -8,7 +8,6 @@ trusted user admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -DSN: r1 propagating DSN 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 @@ -139,7 +138,6 @@ trusted user admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -DSN: r1 propagating DSN 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 @@ -208,8 +206,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -calling local_scan(); timeout=300 -local_scan() returned 0 NULL Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 @@ -221,7 +217,7 @@ LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -230,7 +226,6 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user -DSN: r1 propagating DSN seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages @@ -247,21 +242,21 @@ Empty Tree recipients_count=1 **** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 -DSN: set orcpt: NULL flags: 0 +DSN: set orcpt: flags: 0 Delivery address list: 2@b -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: 2@b unique = 2@b -no domain retry record -no address retry record +no domain retry record +no address retry record 2@b: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing 2@b @@ -288,11 +283,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 @@ -392,8 +387,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -calling local_scan(); timeout=300 -local_scan() returned 0 NULL Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 @@ -405,7 +398,7 @@ LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss SMTP>> 250 OK id=10HmaY-0005vi-00 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -414,7 +407,6 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user -DSN: r1 propagating DSN seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages @@ -431,20 +423,20 @@ Empty Tree recipients_count=1 **** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 -DSN: set orcpt: NULL flags: 0 +DSN: set orcpt: flags: 0 Delivery address list: 2@b -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: 2@b unique = 2@b -no domain retry record -no address retry record +no domain retry record +no address retry record 2@b: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing 2@b @@ -471,11 +463,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1