X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/aae673d7db4b26e8c4a8cc3d59fe94de4c47ba16..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/stderr/2600?ds=sidebyside diff --git a/test/stderr/2600 b/test/stderr/2600 index 7d8e76824..8bfaf1c92 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -11,7 +12,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 +23,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 +34,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 +44,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 +77,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 +88,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 +99,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 +111,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 +122,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,10 +133,11 @@ 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 .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -193,7 +195,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" @@ -234,7 +236,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" @@ -264,6 +266,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -321,7 +324,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 @@ -362,7 +365,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" @@ -392,6 +395,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -449,7 +453,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 @@ -459,7 +463,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") @@ -485,7 +489,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" @@ -495,7 +499,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") @@ -509,6 +513,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -529,34 +534,35 @@ 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 .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1239 configuration file is TESTSUITE/test-config @@ -566,9 +572,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: @@ -580,8 +586,6 @@ body_linecount=1 message_linecount=8 DSN: set orcpt: flags: 0x0 Delivery address list: userx@myhost.test.ex - 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 @@ -606,7 +610,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 @@ -628,8 +632,6 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- - 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 @@ -638,7 +640,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" @@ -667,6 +669,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> journalling userx@myhost.test.ex t1 transport returned OK for userx@myhost.test.ex post-process userx@myhost.test.ex (0) @@ -676,7 +679,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 @@ -693,13 +696,14 @@ 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 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -712,10 +716,11 @@ 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 .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -728,10 +733,11 @@ 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 .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -740,6 +746,7 @@ dropping to exim gid; retaining priv uid search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid