X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/2610?ds=sidebyside diff --git a/test/stderr/2610 b/test/stderr/2610 index 710057f1f..5bbc3c165 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -231,31 +231,6 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 -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 @@ -277,8 +252,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 @@ -485,38 +458,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 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=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 @@ -541,16 +489,16 @@ 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 ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_notsmtp" @@ -559,25 +507,18 @@ check set acl_m_qtest = ${quote_mysql:$recipients} = ph10@myhost.test.ex accept: condition test succeeded in ACL "check_notsmtp" end of ACL "check_notsmtp": ACCEPT -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=p1237 -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 @@ -585,9 +526,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: @@ -633,16 +574,16 @@ processing address_data search_open: mysql "NULL" cached open search_find: file="NULL" - key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0 opts=NULL + key="select name from them where id='ph10' limit 1" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="NULL" - type=mysql key="select name from them where id='ph10'" opts=NULL - database lookup required for select name from them where id='ph10' + type=mysql key="select name from them where id='ph10' limit 1" opts=NULL + database lookup required for select name from them where id='ph10' limit 1 (tainted) LOG: MAIN PANIC - tainted search query is not properly quoted (router r1, TESTSUITE/test-config 66): select name from them where id='ph10' + tainted search query is not properly quoted (router r1, TESTSUITE/test-config 66): select name from them where id='ph10' limit 1 search_type NN (mysql) quoting -1 (none) - MySQL query: "select name from them where id='ph10'" opts 'NULL' + MySQL query: "select name from them where id='ph10' limit 1" opts 'NULL' MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry lookup yielded: Philip Hazel @@ -678,7 +619,7 @@ search_tidyup called changed uid/gid: local delivery to ph10 transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1238 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to ph10 using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to ph10 using t1 appendfile transport entered search_open: mysql "NULL" search_find: file="NULL" @@ -689,7 +630,7 @@ appendfile transport entered database lookup required for select id from them where id='ph10' (tainted) LOG: MAIN - tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 79): select id from them where id='ph10' + tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 80): 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=PORT_N socket=NULL database=test user=root @@ -722,7 +663,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1237 -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: ph10@myhost.test.ex: no retry items @@ -739,7 +680,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=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>