X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..0585799ba85d257f1e2428c1615b00c30c60931e:/test/stderr/2600?ds=inline diff --git a/test/stderr/2600 b/test/stderr/2600 index e4cff0d3b..ae1208ca6 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -11,7 +11,7 @@ dropping to exim gid; retaining priv uid file lookup required for select name from them where id='userx'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: Ayen Other + lookup yielded: Ayen░Other search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -22,7 +22,7 @@ dropping to exim gid; retaining priv uid cached data found but wrong opts; file lookup required for select name from them where id='userx'; c in TESTSUITE/aux-fixed/sqlitedb replacing old cache entry - lookup yielded: Ayen Other + lookup yielded: Ayen░Other search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -33,7 +33,7 @@ dropping to exim gid; retaining priv uid cached data found but wrong opts; file lookup required for select name from them where id='userx'; c in TESTSUITE/aux-fixed/sqlitedb replacing old cache entry - lookup yielded: Ayen Other + lookup yielded: Ayen░Other search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -43,7 +43,7 @@ dropping to exim gid; retaining priv uid type=sqlite key="select name from them where id='userx';" opts="file=TESTSUITE/aux-fixed/sqlitedb" cached data used for lookup of select name from them where id='userx'; in TESTSUITE/aux-fixed/sqlitedb - lookup yielded: Ayen Other + lookup yielded: Ayen░Other search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -76,7 +76,7 @@ dropping to exim gid; retaining priv uid file lookup required for select id,name from them where id='nothing'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: id=nothing name="" + lookup yielded: id=nothing░name=""░ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -87,7 +87,7 @@ dropping to exim gid; retaining priv uid file lookup required for select * from them where id='quote2'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: name="\"stquot" id=quote2 + lookup yielded: name="\"stquot"░id=quote2░ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -98,8 +98,8 @@ dropping to exim gid; retaining priv uid file lookup required for select * from them where id='newline'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: name="before - after" id=newline + lookup yielded: name="before↩ + after"░id=newline░ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -110,7 +110,7 @@ dropping to exim gid; retaining priv uid file lookup required for select * from them where id='tab'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: name="x x" id=tab + lookup yielded: name="x␉x"░id=tab░ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -121,7 +121,7 @@ dropping to exim gid; retaining priv uid file lookup required for select * from them where id='its'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: name=it's id=its + lookup yielded: name=it's░id=its░ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -132,37 +132,12 @@ dropping to exim gid; retaining priv uid file lookup required for select * from them where name='it''s'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: name=it's id=its + lookup yielded: name=it's░id=its░ search_tidyup called >>>>>>>>>>>>>>>> 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=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 @@ -184,8 +159,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 @@ -220,7 +193,7 @@ host in "+relay_hosts"? list element: +relay_hosts start sublist relay_hosts host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"? - ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0' + ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb;░select░*░from░them░where░id='10.0.0.0' ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb" ╎ key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts="file=TESTSUITE/aux-fixed/sqlitedb" @@ -261,7 +234,7 @@ host in "+relay_hosts"? list element: +relay_hosts start sublist relay_hosts host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"? - ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0' + ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb;░select░*░from░them░where░id='10.0.0.0' ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" ╎ cached open ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -287,37 +260,12 @@ 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 >>>>>>>>>>>>>>>> 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 @@ -339,8 +287,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 @@ -375,7 +321,7 @@ host in "+relay_hosts"? list element: +relay_hosts start sublist relay_hosts host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? - ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0' + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.0.0.0' ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb" ╎ key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL @@ -416,7 +362,7 @@ host in "+relay_hosts"? list element: +relay_hosts start sublist relay_hosts host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? - ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0' + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.0.0.0' ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" ╎ cached open ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -442,37 +388,12 @@ 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 >>>>>>>>>>>>>>>> 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 @@ -494,8 +415,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 @@ -530,7 +449,7 @@ host in "+relay_hosts"? list element: +relay_hosts start sublist relay_hosts host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? - ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10' + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.10.10.10' ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb" ╎ key="select * from them where id='10.10.10.10'" partial=-1 affix=NULL starflags=0 opts=NULL @@ -540,7 +459,7 @@ host in "+relay_hosts"? ╎file lookup required for select * from them where id='10.10.10.10' ╎ in TESTSUITE/aux-fixed/sqlitedb ╎creating new cache entry - ╎lookup yielded: name=ok id=10.10.10.10 + ╎lookup yielded: name=ok░id=10.10.10.10░ ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") end sublist relay_hosts host in "+relay_hosts"? yes (matched "+relay_hosts") @@ -566,7 +485,7 @@ host in "+relay_hosts"? list element: +relay_hosts start sublist relay_hosts host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? - ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10' + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb░select░*░from░them░where░id='10.10.10.10' ╎search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" ╎ cached open ╎search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -576,7 +495,7 @@ host in "+relay_hosts"? ╎ type=sqlite key="select * from them where id='10.10.10.10'" opts=NULL ╎cached data used for lookup of select * from them where id='10.10.10.10' ╎ in TESTSUITE/aux-fixed/sqlitedb - ╎lookup yielded: name=ok id=10.10.10.10 + ╎lookup yielded: name=ok░id=10.10.10.10░ ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") end sublist relay_hosts host in "+relay_hosts"? yes (matched "+relay_hosts") @@ -586,37 +505,12 @@ SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.10.10.10] closed by QUIT + SMTP connection from (test) [10.10.10.10] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> 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=p1238 -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 @@ -635,43 +529,36 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + 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 userx@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 -DOPT=y -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -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=p1239 -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 @@ -679,9 +566,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: @@ -719,7 +606,7 @@ processing address_data file lookup required for select name from them where id='userx' in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: Ayen Other + lookup yielded: Ayen░Other calling r1 router r1 router called for userx@myhost.test.ex domain = myhost.test.ex @@ -751,7 +638,7 @@ search_tidyup called changed uid/gid: local delivery to userx transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -789,7 +676,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1239 -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: userx@myhost.test.ex: no retry items @@ -806,7 +693,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=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -825,7 +712,7 @@ dropping to exim gid; retaining priv uid file lookup required for select name from them where id='userx'; in TESTSUITE/aux-fixed/sqlitedb creating new cache entry - lookup yielded: Ayen Other + lookup yielded: Ayen░Other search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -841,7 +728,7 @@ dropping to exim gid; retaining priv uid type=sqlite key="select name from them where id='userx';" opts=NULL database lookup required for select name from them where id='userx'; creating new cache entry - lookup yielded: Ayen Other + lookup yielded: Ayen░Other search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz ....