X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3a9262974035b6b8efebffcdf50a2371f3636477..e434e6743ac97c28b7d2b6d43f564eceb5450697:/test/stderr/5005 diff --git a/test/stderr/5005 b/test/stderr/5005 index 791e5eb0c..4941a2981 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -34,23 +34,24 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaX-0005vi-00 for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |nofile@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: Write SPOOL: -dsn_envid NULL +DSN: Write SPOOL :-dsn_ret 0 +DSN: Flags: 0x0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00 +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 configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages @@ -65,7 +66,7 @@ Empty Tree recipients_count=1 **** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 -DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0x0 Delivery address list: nofile@test.ex locking TESTSUITE/spool/db/retry.lockfile @@ -173,7 +174,7 @@ end of retry processing DSN: processing router : r1 DSN: processing successful delivery address: nofile@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: nofile@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -183,9 +184,9 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -222,22 +223,23 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: Write SPOOL: -dsn_envid NULL +DSN: Write SPOOL :-dsn_ret 0 +DSN: Flags: 0x0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 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 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaY-0005vi-00 +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 configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages @@ -252,7 +254,7 @@ Empty Tree recipients_count=1 **** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 -DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0x0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile @@ -361,7 +363,7 @@ end of retry processing DSN: processing router : r1 DSN: processing successful delivery address: userx@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: userx@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -371,9 +373,9 @@ LOG: MAIN end delivery of 10HmaY-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -410,22 +412,23 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: Write SPOOL: -dsn_envid NULL +DSN: Write SPOOL :-dsn_ret 0 +DSN: Flags: 0x0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaZ-0005vi-00 +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 configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages @@ -440,7 +443,7 @@ Empty Tree recipients_count=1 **** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 -DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0x0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile @@ -559,18 +562,18 @@ Writing retry data for T:userx@test.ex end of retry processing delivery deferred: update_spool=1 header_rewritten=0 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: Write SPOOL: -dsn_envid NULL +DSN: Write SPOOL :-dsn_ret 0 +DSN: Flags: 0x0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss end delivery of 10HmaZ-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -607,22 +610,23 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: Write SPOOL: -dsn_envid NULL +DSN: Write SPOOL :-dsn_ret 0 +DSN: Flags: 0x0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmbA-0005vi-00 +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 configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages @@ -637,7 +641,7 @@ Empty Tree recipients_count=1 **** SPOOL_IN - No additional fields body_linecount=1 message_linecount=7 -DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0x0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile @@ -751,15 +755,15 @@ Writing retry data for T:userx@test.ex end of retry processing delivery deferred: update_spool=1 header_rewritten=0 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: Write SPOOL: -dsn_envid NULL +DSN: Write SPOOL :-dsn_ret 0 +DSN: Flags: 0x0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss end delivery of 10HmbA-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>