X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/42c7f0b4ea09d8971a19beeef743ec8981d4aacc..a5dc727afcc92deab722a84ae5cf3d00ae74c5f6:/test/stderr/2600 diff --git a/test/stderr/2600 b/test/stderr/2600 index 3c2b058d6..3c4a59271 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -4,30 +4,30 @@ admin user dropping to exim gid; retaining priv uid search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 + key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select name from them where id='userx';" + type=sqlite key="select name from them where id='userx';" opts=NULL file lookup required for select name from them where id='userx'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: Ayen Other search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 + key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select name from them where id='userx';" + type=sqlite key="select name from them where id='userx';" opts=NULL cached data used for lookup of select name from them where id='userx'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: Ayen Other search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0 + key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select name from them where id='xxxx';" + type=sqlite key="select name from them where id='xxxx';" opts=NULL file lookup required for select name from them where id='xxxx'; in TESTSUITE/aux-fixed/sqlitedb lookup forced cache cleanup @@ -35,40 +35,40 @@ dropping to exim gid; retaining priv uid search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0 + key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select name from them where id='nothing';" + type=sqlite key="select name from them where id='nothing';" opts=NULL file lookup required for select name from them where id='nothing'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0 + key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select id,name from them where id='nothing';" + type=sqlite key="select id,name from them where id='nothing';" opts=NULL file lookup required for select id,name from them where id='nothing'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: id=nothing name="" search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0 + key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='quote2';" + type=sqlite key="select * from them where id='quote2';" opts=NULL file lookup required for select * from them where id='quote2'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: name="\"stquot" id=quote2 search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0 + key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='newline';" + type=sqlite key="select * from them where id='newline';" opts=NULL file lookup required for select * from them where id='newline'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: name="before @@ -76,35 +76,35 @@ dropping to exim gid; retaining priv uid search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0 + key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='tab';" + type=sqlite key="select * from them where id='tab';" opts=NULL file lookup required for select * from them where id='tab'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: name="x x" id=tab search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where id='its';" partial=-1 affix=NULL starflags=0 + key="select * from them where id='its';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='its';" + type=sqlite key="select * from them where id='its';" opts=NULL file lookup required for select * from them where id='its'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: name=it's id=its search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where name='it''s';" partial=-1 affix=NULL starflags=0 + key="select * from them where name='it''s';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where name='it''s';" + type=sqlite key="select * from them where name='it''s';" opts=NULL file lookup required for select * from them where name='it''s'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: name=it's id=its search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) 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 @@ -137,19 +137,19 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts 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 + key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='10.0.0.0'" + type=sqlite key="select * from them where id='10.0.0.0'" opts=NULL file lookup required for select * from them where id='10.0.0.0' in TESTSUITE/aux-fixed/sqlitedb lookup forced cache cleanup @@ -157,7 +157,7 @@ lookup failed host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list) host in "+relay_hosts"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "deny" (TESTSUITE/test-config 25) +processing "deny" (TESTSUITE/test-config 28) message: relay not permitted deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY @@ -166,20 +166,20 @@ LOG: MAIN REJECT H=[10.0.0.0] F= rejected RCPT : relay not permitted SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 + key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='10.0.0.0'" + type=sqlite key="select * from them where id='10.0.0.0'" opts=NULL file lookup required for select * from them where id='10.0.0.0' in TESTSUITE/aux-fixed/sqlitedb lookup forced cache cleanup @@ -187,7 +187,7 @@ lookup failed host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? no (end of list) host in "+relay_hosts"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "deny" (TESTSUITE/test-config 25) +processing "deny" (TESTSUITE/test-config 28) message: relay not permitted deny: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": DENY @@ -199,7 +199,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [10.0.0.0] closed by QUIT 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 @@ -232,19 +232,19 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts 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 + key="select * from them where id='10.10.10.10'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='10.10.10.10'" + type=sqlite key="select * from them where id='10.10.10.10'" opts=NULL file lookup required for select * from them where id='10.10.10.10' in TESTSUITE/aux-fixed/sqlitedb lookup yielded: name=ok id=10.10.10.10 @@ -256,20 +256,20 @@ SMTP>> 250 Accepted DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: using ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 23) +processing "accept" (TESTSUITE/test-config 26) check domains = +local_domains d in "@"? no (end of list) d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" -processing "accept" (TESTSUITE/test-config 24) +processing "accept" (TESTSUITE/test-config 27) check hosts = +relay_hosts search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" cached open search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select * from them where id='10.10.10.10'" partial=-1 affix=NULL starflags=0 + key="select * from them where id='10.10.10.10'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='10.10.10.10'" + 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 @@ -284,7 +284,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [10.10.10.10] closed by QUIT 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 @@ -331,7 +331,7 @@ 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 -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 @@ -376,10 +376,10 @@ local_part=userx domain=myhost.test.ex processing address_data search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select name from them where id='userx'" partial=-1 affix=NULL starflags=0 + key="select name from them where id='userx'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select name from them where id='userx'" + type=sqlite key="select name from them where id='userx'" opts=NULL file lookup required for select name from them where id='userx' in TESTSUITE/aux-fixed/sqlitedb lookup yielded: Ayen Other @@ -418,10 +418,10 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 appendfile transport entered search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select id from them where id='userx'" partial=-1 affix=NULL starflags=0 + key="select id from them where id='userx'" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select id from them where id='userx'" + type=sqlite key="select id from them where id='userx'" opts=NULL file lookup required for select id from them where id='userx' in TESTSUITE/aux-fixed/sqlitedb lookup yielded: userx @@ -471,21 +471,35 @@ 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 .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" - key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 + key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 opts=NULL LRU list: internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select name from them where id='userx';" + type=sqlite key="select name from them where id='userx';" opts=NULL file lookup required for select name from them where id='userx'; in TESTSUITE/aux-fixed/sqlitedb lookup yielded: Ayen Other search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid + search_open: sqlite "NULL" + search_find: file="NULL" + key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0 + LRU list: + internal_search_find: file="NULL" + type=sqlite key="select name from them where id='userx';" + database lookup required for select name from them where id='userx'; + lookup yielded: Ayen Other +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>