X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..f0ce0ecaa054ad9773a2078bc8f011a59518120a:/test/stderr/2620 diff --git a/test/stderr/2620 b/test/stderr/2620 index b631229e7..f1e7438cf 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -217,31 +217,6 @@ close PGSQL connection: localhost:PORT_N/test/CALLER Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 -SHELL in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -EXIM_TEST_NUMBER in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PWD in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -TERM in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -USER in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -SHLVL in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PATH in keep_environment? - list element: PATH -_ in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PATH in keep_environment? - list element: PATH configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -263,8 +238,6 @@ host in recipient_unqualified_hosts? no (option unset) host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -651,38 +624,13 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.0.0.0] closed by QUIT + SMTP connection from (test) [10.0.0.0] D=qqs closed by QUIT search_tidyup called close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 -SHELL in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -EXIM_TEST_NUMBER in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PWD in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -TERM in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -USER in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -SHLVL in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PATH in keep_environment? - list element: PATH -_ in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PATH in keep_environment? - list element: PATH configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -707,37 +655,30 @@ rewrite headers From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: +I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.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 -MCd local-accept-delivery -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-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 -PATH in keep_environment? - list element: PATH -SSLKEYLOGFILE in keep_environment? - list element: PATH - list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -PATH in keep_environment? - list element: PATH configuration file is TESTSUITE/test-config trusted user admin user @@ -745,9 +686,9 @@ 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 -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex sender_local=1 ident=CALLER Non-recipients: @@ -819,7 +760,7 @@ search_tidyup called changed uid/gid: local delivery to CALLER transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to CALLER using t1 appendfile transport entered search_open: pgsql "NULL" search_find: file="NULL" @@ -859,7 +800,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1238 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: CALLER@myhost.test.ex: no retry items @@ -876,7 +817,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>