X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9f1a75f126ae217a3a3568b106c9133b3c5c413a..4f1d6cb9b60f4d26c0654eba8889c04079d046d2:/test/stderr/2610 diff --git a/test/stderr/2610 b/test/stderr/2610 index 5306d8582..6fedeb321 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -255,6 +255,9 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test +test in helo_lookup_domains? + list element: @ + list element: @[] test in helo_lookup_domains? no (end of list) sender_fullhost = (test) [10.0.0.0] sender_rcvhost = [10.0.0.0] (helo=test) @@ -352,36 +355,40 @@ LOG: MAIN processing "warn" (TESTSUITE/test-config 40) check set acl_m0 = ok: hostlist check hosts = net-mysql;select * from them where id='${quote_mysql:$local_part}' -search_open: mysql "NULL" - cached open -search_find: file="NULL" - key="select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL -LRU list: -internal_search_find: file="NULL" - type=mysql key="select * from them where id='c'" opts=NULL -database lookup required for select * from them where id='c' - (tainted, quoted:mysql) -MySQL query: "select * from them where id='c'" opts 'NULL' -MYSQL using cached connection for 127.0.0.1:PORT_N/test/root -MYSQL: no data found -creating new cache entry -lookup failed +host in "net-mysql;select * from them where id='c'"? + list element: net-mysql;select * from them where id='c' + search_open: mysql "NULL" + cached open + search_find: file="NULL" + key="select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + LRU list: + internal_search_find: file="NULL" + type=mysql key="select * from them where id='c'" opts=NULL + database lookup required for select * from them where id='c' + (tainted, quoted:mysql) + MySQL query: "select * from them where id='c'" opts 'NULL' + MYSQL using cached connection for 127.0.0.1:PORT_N/test/root + MYSQL: no data found + creating new cache entry + lookup failed host in "net-mysql;select * from them where id='c'"? no (end of list) warn: condition test failed in ACL "check_recipient" processing "warn" (TESTSUITE/test-config 43) check set acl_m0 = FAIL: hostlist check hosts = <& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' -search_open: mysql "NULL" - cached open -search_find: file="NULL" - key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL -LRU list: -internal_search_find: file="NULL" - type=mysql key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts=NULL -database lookup required for servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c' - (tainted, quoted:mysql) -MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts 'NULL' -lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted +host in "<& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? + list element: net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c' + search_open: mysql "NULL" + cached open + search_find: file="NULL" + key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL + LRU list: + internal_search_find: file="NULL" + type=mysql key="servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts=NULL + database lookup required for servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c' + (tainted, quoted:mysql) + MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts 'NULL' + lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted host in "<& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN @@ -389,42 +396,56 @@ LOG: MAIN processing "warn" (TESTSUITE/test-config 48) check set acl_m0 = FAIL: hostlist check hosts = <& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' -search_open: mysql "NULL" - cached open -search_find: file="NULL" - key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N/test/root/pass" -LRU list: -internal_search_find: file="NULL" - type=mysql key=" select * from them where id='c'" opts="servers=127.0.0.1::PORT_N/test/root/pass" -database lookup required for select * from them where id='c' - (tainted, quoted:mysql) -MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' -lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted +host in "<& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? + list element: net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c' + search_open: mysql "NULL" + cached open + search_find: file="NULL" + key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=127.0.0.1::PORT_N/test/root/pass" + LRU list: + internal_search_find: file="NULL" + type=mysql key=" select * from them where id='c'" opts="servers=127.0.0.1::PORT_N/test/root/pass" + database lookup required for select * from them where id='c' + (tainted, quoted:mysql) + MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' + lookup deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted host in "<& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c' warn: condition test deferred in ACL "check_recipient" LOG: MAIN H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test/root/pass" is tainted processing "accept" (TESTSUITE/test-config 51) check domains = +local_domains -d in "@"? no (end of list) +d in "+local_domains"? + list element: +local_domains + start sublist local_domains + d in "@"? + ╎list element: @ + d in "@"? no (end of list) + end sublist local_domains d in "+local_domains"? no (end of list) accept: condition test failed in ACL "check_recipient" processing "accept" (TESTSUITE/test-config 54) check hosts = +relay_hosts -search_open: mysql "NULL" - cached open -search_find: file="NULL" - key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL -LRU list: -internal_search_find: file="NULL" - type=mysql key="select * from them where id='10.0.0.0'" opts=NULL -database lookup required for select * from them where id='10.0.0.0' -MySQL query: "select * from them where id='10.0.0.0'" opts 'NULL' -MYSQL using cached connection for 127.0.0.1:PORT_N/test/root -MYSQL: no data found -creating new cache entry -lookup failed -host in "net-mysql;select * from them where id='10.0.0.0'"? no (end of list) +host in "+relay_hosts"? + list element: +relay_hosts + start sublist relay_hosts + host in "net-mysql;select * from them where id='10.0.0.0'"? + ╎list element: net-mysql;select * from them where id='10.0.0.0' + ╎search_open: mysql "NULL" + ╎ cached open + ╎search_find: file="NULL" + ╎ key="select * from them where id='10.0.0.0'" partial=-1 affix=NULL starflags=0 opts=NULL + ╎LRU list: + ╎internal_search_find: file="NULL" + ╎ type=mysql key="select * from them where id='10.0.0.0'" opts=NULL + ╎database lookup required for select * from them where id='10.0.0.0' + ╎MySQL query: "select * from them where id='10.0.0.0'" opts 'NULL' + ╎MYSQL using cached connection for 127.0.0.1:PORT_N/test/root + ╎MYSQL: no data found + ╎creating new cache entry + ╎lookup failed + host in "net-mysql;select * from them where id='10.0.0.0'"? no (end of list) + end sublist relay_hosts host in "+relay_hosts"? no (end of list) accept: condition test failed in ACL "check_recipient" processing "deny" (TESTSUITE/test-config 55) @@ -437,7 +458,7 @@ 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 >>>>>>>>>>>>>>>> @@ -462,22 +483,22 @@ 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 ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_notsmtp" @@ -486,15 +507,15 @@ 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 @@ -505,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: @@ -553,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 @@ -598,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" @@ -609,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 @@ -642,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 @@ -659,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 >>>>>>>>>>>>>>>>