X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ac8aeb5485a80a06ac8a52b43b84210564cd7e09..aff5e0c480dd4ac2ccd15906c250c18c93ac7f12:/test/stderr/2610 diff --git a/test/stderr/2610 b/test/stderr/2610 index c762e0340..e964a6fba 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -137,7 +137,7 @@ dropping to exim gid; retaining priv uid database lookup required for servers=x:127.0.0.1::PORT_N; select name from them where id='ph10'; MySQL query: "servers=x:127.0.0.1::PORT_N; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 89 of TESTSUITE/test-config: + Exim configuration error in line 11 of -be stdin: WARNING: obsolete syntax used for lookup lookup deferred: MySQL server "x" not found in mysql_servers search_open: mysql "NULL" @@ -150,7 +150,7 @@ LOG: MAIN database lookup required for servers=127.0.0.1::PORT_N:x; select name from them where id='ph10'; MySQL query: "servers=127.0.0.1::PORT_N:x; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 89 of TESTSUITE/test-config: + Exim configuration error in line 12 of -be stdin: WARNING: obsolete syntax used for lookup MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry @@ -165,7 +165,7 @@ LOG: MAIN database lookup required for servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10'; MySQL query: "servers=127.0.0.1::PORT_N/test/root/:x; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 89 of TESTSUITE/test-config: + Exim configuration error in line 13 of -be stdin: WARNING: obsolete syntax used for lookup MYSQL using cached connection for 127.0.0.1:PORT_N/test/root creating new cache entry @@ -180,7 +180,7 @@ LOG: MAIN database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10'; MySQL query: "servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::PORT_N; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 89 of TESTSUITE/test-config: + Exim configuration error in line 14 of -be stdin: WARNING: obsolete syntax used for lookup MYSQL new connection: host=ip4.ip4.ip4.ip4 port=PORT_N socket=NULL database=test user=root creating new cache entry @@ -195,7 +195,7 @@ LOG: MAIN database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/pass; select name from them where id='ph10'; MySQL query: "servers=localhost(TESTSUITE/mysql/sock)/test/root/pass; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 89 of TESTSUITE/test-config: + Exim configuration error in line 15 of -be stdin: WARNING: obsolete syntax used for lookup MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root creating new cache entry @@ -304,8 +304,6 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 sender_fullhost = (test) [10.0.0.0] 01:01:01 p1235 sender_rcvhost = [10.0.0.0] (helo=test) 01:01:01 p1235 set_process_info: pppp handling incoming connection from (test) [10.0.0.0] -01:01:01 p1235 spf_conn_init: test 10.0.0.0 -01:01:01 p1235 SPF_dns_exim_new 01:01:01 p1235 try option acl_smtp_helo 01:01:01 p1235 SMTP>> 250 myhost.test.ex Hello test [10.0.0.0] 01:01:01 p1235 SMTP<< mail from: @@ -316,7 +314,7 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 SMTP<< rcpt to: 01:01:01 p1235 try option acl_smtp_rcpt 01:01:01 p1235 using ACL "check_recipient" -01:01:01 p1235 processing "warn" (TESTSUITE/test-config 26) +01:01:01 p1235 processing ACL check_recipient "warn" (TESTSUITE/test-config 26) 01:01:01 p1235 ╭considering: ok:░░░░${lookup░mysql░░░░░░░░░░░░░░░░░░░░{select░name░from░them░where░id░=░'${quote_mysql:$local_part}'}} 01:01:01 p1235 ├───────text: ok:░░░░ 01:01:01 p1235 ├considering: ${lookup░mysql░░░░░░░░░░░░░░░░░░░░{select░name░from░them░where░id░=░'${quote_mysql:$local_part}'}} @@ -379,9 +377,10 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 type=mysql key="select name from them where id = 'c'" opts="no_rd" 01:01:01 p1235 cached data found but wrong opts; database lookup required for select name from them where id = 'c' 01:01:01 p1235 (tainted) +01:01:01 p1235 No quoter name for addr 01:01:01 p1235 LOG: MAIN PANIC 01:01:01 p1235 tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 26): select name from them where id = 'c' -01:01:01 p1235 required_quoter_id NN (mysql) quoting -1 (NULL) +01:01:01 p1235 required_quoter_id (mysql) quoting -1 (NULL) 01:01:01 p1235 MySQL query: "select name from them where id = 'c'" opts 'no_rd' 01:01:01 p1235 MYSQL using cached connection for 127.0.0.1:PORT_N/test/root 01:01:01 p1235 MYSQL: no data found @@ -392,8 +391,8 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 ╰─────result: FAIL1:░ 01:01:01 p1235 check set acl_m0 = FAIL1: ${lookup mysql,no_rd {select name from them where id = '$local_part'}} 01:01:01 p1235 = FAIL1: -01:01:01 p1235 warn: condition test succeeded in ACL "check_recipient" -01:01:01 p1235 processing "warn" (TESTSUITE/test-config 31) +01:01:01 p1235 warn: condition test succeeded in ACL check_recipient +01:01:01 p1235 processing ACL check_recipient "warn" (TESTSUITE/test-config 31) 01:01:01 p1235 ╭considering: ok:░░░░${lookup░mysql,servers=127.0.0.1::PORT_N/test/root/pass░░░░░░{select░name░from░them░where░id░=░'${quote_mysql:$local_part}'}} 01:01:01 p1235 ├───────text: ok:░░░░ 01:01:01 p1235 ├considering: ${lookup░mysql,servers=127.0.0.1::PORT_N/test/root/pass░░░░░░{select░name░from░them░where░id░=░'${quote_mysql:$local_part}'}} @@ -506,15 +505,15 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 (tainted, quoted:mysql) 01:01:01 p1235 MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" opts 'NULL' 01:01:01 p1235 LOG: MAIN -01:01:01 p1235 Exim configuration error in line 89 of TESTSUITE/test-config: +01:01:01 p1235 Exim configuration error in ACL verb at line 31 of TESTSUITE/test-config: 01:01:01 p1235 WARNING: obsolete syntax used for lookup 01:01:01 p1235 lookup deferred: MySQL server "127.0.0.1:PORT_N/test" is tainted 01:01:01 p1235 ├failed to expand: FAIL2: ${lookup mysql {servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = '${quote_mysql:$local_part}'}} 01:01:01 p1235 ╰───error message: lookup of "servers=127.0.0.1::PORT_N/test/root/pass; select name from them where id = 'c'" gave DEFER: MySQL server "127.0.0.1:1223/test" is tainted -01:01:01 p1235 warn: condition test deferred in ACL "check_recipient" +01:01:01 p1235 warn: condition test deferred in ACL check_recipient 01:01:01 p1235 LOG: MAIN 01:01:01 p1235 H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test" is tainted -01:01:01 p1235 processing "warn" (TESTSUITE/test-config 39) +01:01:01 p1235 processing ACL check_recipient "warn" (TESTSUITE/test-config 39) 01:01:01 p1235 ╭considering: FAIL3:░${lookup░mysql░░░░░{servers=127.0.0.1::PORT_N;░select░name░from░them░where░id░=░'$local_part'}} 01:01:01 p1235 ├───────text: FAIL3:░ 01:01:01 p1235 ├considering: ${lookup░mysql░░░░░{servers=127.0.0.1::PORT_N;░select░name░from░them░where░id░=░'$local_part'}} @@ -538,12 +537,13 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 type=mysql key="servers=127.0.0.1::PORT_N; select name from them where id = 'c'" opts=NULL 01:01:01 p1235 database lookup required for servers=127.0.0.1::PORT_N; select name from them where id = 'c' 01:01:01 p1235 (tainted) +01:01:01 p1235 No quoter name for addr 01:01:01 p1235 LOG: MAIN PANIC 01:01:01 p1235 tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 39): select name from them where id = 'c' -01:01:01 p1235 required_quoter_id NN (mysql) quoting -1 (NULL) +01:01:01 p1235 required_quoter_id (mysql) quoting -1 (NULL) 01:01:01 p1235 MySQL query: "servers=127.0.0.1::PORT_N; select name from them where id = 'c'" opts 'NULL' 01:01:01 p1235 LOG: MAIN -01:01:01 p1235 Exim configuration error in line 89 of TESTSUITE/test-config: +01:01:01 p1235 Exim configuration error in ACL verb at line 39 of TESTSUITE/test-config: 01:01:01 p1235 WARNING: obsolete syntax used for lookup 01:01:01 p1235 MYSQL using cached connection for 127.0.0.1:PORT_N/test/root 01:01:01 p1235 MYSQL: no data found @@ -554,8 +554,8 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 ╰─────result: FAIL3:░ 01:01:01 p1235 check set acl_m0 = FAIL3: ${lookup mysql {servers=127.0.0.1::PORT_N; select name from them where id = '$local_part'}} 01:01:01 p1235 = FAIL3: -01:01:01 p1235 warn: condition test succeeded in ACL "check_recipient" -01:01:01 p1235 processing "warn" (TESTSUITE/test-config 42) +01:01:01 p1235 warn: condition test succeeded in ACL check_recipient +01:01:01 p1235 processing ACL check_recipient "warn" (TESTSUITE/test-config 42) 01:01:01 p1235 check set acl_m0 = ok: hostlist 01:01:01 p1235 check hosts = net-mysql;select * from them where id='${quote_mysql:$local_part}' 01:01:01 p1235 ╭considering: net-mysql;select░*░from░them░where░id='${quote_mysql:$local_part}' @@ -592,8 +592,8 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 creating new cache entry 01:01:01 p1235 lookup failed 01:01:01 p1235 host in "net-mysql;select * from them where id='c'"? no (end of list) -01:01:01 p1235 warn: condition test failed in ACL "check_recipient" -01:01:01 p1235 processing "warn" (TESTSUITE/test-config 45) +01:01:01 p1235 warn: condition test failed in ACL check_recipient +01:01:01 p1235 processing ACL check_recipient "warn" (TESTSUITE/test-config 45) 01:01:01 p1235 check set acl_m0 = FAIL4: hostlist 01:01:01 p1235 check hosts = <& net-mysql;servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' 01:01:01 p1235 ╭considering: <&░net-mysql;servers=127.0.0.1::PORT_N/test/root/pass;░select░*░from░them░where░id='${quote_mysql:$local_part}' @@ -626,14 +626,14 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 (tainted, quoted:mysql) 01:01:01 p1235 MySQL query: "servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='c'" opts 'NULL' 01:01:01 p1235 LOG: MAIN -01:01:01 p1235 Exim configuration error in line 89 of TESTSUITE/test-config: +01:01:01 p1235 Exim configuration error in ACL verb at line 45 of TESTSUITE/test-config: 01:01:01 p1235 WARNING: obsolete syntax used for lookup 01:01:01 p1235 lookup deferred: MySQL server "127.0.0.1:PORT_N/test" is tainted 01:01:01 p1235 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' -01:01:01 p1235 warn: condition test deferred in ACL "check_recipient" +01:01:01 p1235 warn: condition test deferred in ACL check_recipient 01:01:01 p1235 LOG: MAIN 01:01:01 p1235 H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test" is tainted -01:01:01 p1235 processing "warn" (TESTSUITE/test-config 50) +01:01:01 p1235 processing ACL check_recipient "warn" (TESTSUITE/test-config 50) 01:01:01 p1235 check set acl_m0 = FAIL5: hostlist 01:01:01 p1235 check hosts = <& net-mysql,servers=127.0.0.1::PORT_N/test/root/pass; select * from them where id='${quote_mysql:$local_part}' 01:01:01 p1235 ╭considering: <&░net-mysql,servers=127.0.0.1::PORT_N/test/root/pass;░select░*░from░them░where░id='${quote_mysql:$local_part}' @@ -667,10 +667,10 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 MySQL query: " select * from them where id='c'" opts 'servers=127.0.0.1::PORT_N/test/root/pass' 01:01:01 p1235 lookup deferred: MySQL server "127.0.0.1:PORT_N/test" is tainted 01:01:01 p1235 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' -01:01:01 p1235 warn: condition test deferred in ACL "check_recipient" +01:01:01 p1235 warn: condition test deferred in ACL check_recipient 01:01:01 p1235 LOG: MAIN 01:01:01 p1235 H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:PORT_N/test" is tainted -01:01:01 p1235 processing "accept" (TESTSUITE/test-config 53) +01:01:01 p1235 processing ACL check_recipient "accept" (TESTSUITE/test-config 53) 01:01:01 p1235 check domains = +local_domains 01:01:01 p1235 d in "+local_domains"? 01:01:01 p1235 list element: +local_domains @@ -680,8 +680,8 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 d in "@"? no (end of list) 01:01:01 p1235 end sublist local_domains 01:01:01 p1235 d in "+local_domains"? no (end of list) -01:01:01 p1235 accept: condition test failed in ACL "check_recipient" -01:01:01 p1235 processing "accept" (TESTSUITE/test-config 56) +01:01:01 p1235 accept: condition test failed in ACL check_recipient +01:01:01 p1235 processing ACL check_recipient "accept" (TESTSUITE/test-config 56) 01:01:01 p1235 check hosts = +relay_hosts 01:01:01 p1235 host in "+relay_hosts"? 01:01:01 p1235 list element: +relay_hosts @@ -712,11 +712,11 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 host in "net-mysql;select * from them where id='10.0.0.0'"? no (end of list) 01:01:01 p1235 end sublist relay_hosts 01:01:01 p1235 host in "+relay_hosts"? no (end of list) -01:01:01 p1235 accept: condition test failed in ACL "check_recipient" -01:01:01 p1235 processing "deny" (TESTSUITE/test-config 57) +01:01:01 p1235 accept: condition test failed in ACL check_recipient +01:01:01 p1235 processing ACL check_recipient "deny" (TESTSUITE/test-config 57) 01:01:01 p1235 message: relay not permitted -01:01:01 p1235 deny: condition test succeeded in ACL "check_recipient" -01:01:01 p1235 end of ACL "check_recipient": DENY +01:01:01 p1235 deny: condition test succeeded in ACL check_recipient +01:01:01 p1235 end of ACL check_recipient: DENY 01:01:01 p1235 SMTP>> 550 relay not permitted 01:01:01 p1235 LOG: MAIN REJECT 01:01:01 p1235 H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted @@ -769,11 +769,11 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_notsmtp" -processing "accept" (TESTSUITE/test-config 60) +processing ACL check_notsmtp "accept" (TESTSUITE/test-config 60) 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 +accept: condition test succeeded in ACL check_notsmtp +end of ACL check_notsmtp: ACCEPT 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-000000005vi-0000-H @@ -844,9 +844,10 @@ processing address_data 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) +No quoter name for addr LOG: MAIN PANIC tainted search query is not properly quoted (router r1, TESTSUITE/test-config 68): select name from them where id='ph10' limit 1 - required_quoter_id NN (mysql) quoting -1 (NULL) + required_quoter_id (mysql) quoting -1 (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 @@ -888,9 +889,10 @@ appendfile transport entered type=mysql key="select id from them where id='ph10'" opts=NULL database lookup required for select id from them where id='ph10' (tainted) +No quoter name for addr LOG: MAIN tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 82): select id from them where id='ph10' - required_quoter_id NN (mysql) quoting -1 (NULL) + required_quoter_id (mysql) quoting -1 (NULL) 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 creating new cache entry