X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3cee6033bae86d254e51b583d34f6b559a6d95ea..f90a37225c521b9f03f7c2f46e58fe5aae87f920:/test/stderr/2620?ds=inline diff --git a/test/stderr/2620 b/test/stderr/2620 index 7193592a9..fc3e76f2e 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -135,7 +135,7 @@ dropping to exim gid; retaining priv uid database lookup required for servers=x:localhost; select name from them where id='ph10'; PostgreSQL query: "servers=x:localhost; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in line 11 of -be stdin: WARNING: obsolete syntax used for lookup lookup deferred: PostgreSQL server "x" not found in pgsql_servers search_open: pgsql "NULL" @@ -148,7 +148,7 @@ LOG: MAIN database lookup required for servers=localhost::PORT_N:x; select name from them where id='ph10'; PostgreSQL query: "servers=localhost::PORT_N:x; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in line 12 of -be stdin: WARNING: obsolete syntax used for lookup PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry @@ -163,7 +163,7 @@ LOG: MAIN database lookup required for servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10'; PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in line 13 of -be stdin: WARNING: obsolete syntax used for lookup PGSQL using cached connection for localhost:PORT_N/test/CALLER creating new cache entry @@ -178,7 +178,7 @@ LOG: MAIN database lookup required for servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10'; PostgreSQL query: "servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in line 14 of -be stdin: WARNING: obsolete syntax used for lookup PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER creating new cache entry @@ -268,7 +268,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "check_recipient" -processing "warn" (TESTSUITE/test-config 27) +processing ACL check_recipient "warn" (TESTSUITE/test-config 27) search_open: pgsql "NULL" search_find: file="NULL" key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL @@ -293,9 +293,10 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the type=pgsql key="select name from them where id = 'c'" opts=NULL cached data found but no_rd option set; database lookup required for select name from them where id = 'c' (tainted) +No quoter name for addr LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c' - search_type NN (pgsql) quoting -1 (none) + required_quoter_id (pgsql) quoting -1 (NULL) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found @@ -303,8 +304,8 @@ LOG: MAIN PANIC lookup failed check set acl_m0 = FAIL: ${lookup pgsql,cache=no_rd {select name from them where id = '$local_part'}} = FAIL: -warn: condition test succeeded in ACL "check_recipient" -processing "warn" (TESTSUITE/test-config 32) +warn: condition test succeeded in ACL check_recipient +processing ACL check_recipient "warn" (TESTSUITE/test-config 32) search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -348,13 +349,13 @@ check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N {select nam (tainted, quoted:pgsql) PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in ACL verb at line 32 of TESTSUITE/test-config: WARNING: obsolete syntax used for lookup lookup deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -warn: condition test deferred in ACL "check_recipient" +warn: condition test deferred in ACL check_recipient LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -processing "warn" (TESTSUITE/test-config 41) + H=(test) [10.0.0.0] Warning: ACL 'warn' statement skipped (in ACL check_recipient at line 32 of TESTSUITE/test-config): condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted +processing ACL check_recipient "warn" (TESTSUITE/test-config 41) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='${quote_pgsql:$local_part}' host in "net-pgsql;select * from them where id='c'"? @@ -374,8 +375,8 @@ host in "net-pgsql;select * from them where id='c'"? creating new cache entry lookup failed host in "net-pgsql;select * from them where id='c'"? no (end of list) -warn: condition test failed in ACL "check_recipient" -processing "warn" (TESTSUITE/test-config 44) +warn: condition test failed in ACL check_recipient +processing ACL check_recipient "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist check hosts = <& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? @@ -391,14 +392,14 @@ host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them (tainted, quoted:pgsql) PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in ACL verb at line 44 of TESTSUITE/test-config: WARNING: obsolete syntax used for lookup lookup deferred: PostgreSQL server "localhost:PORT_N/test" is tainted host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' -warn: condition test deferred in ACL "check_recipient" +warn: condition test deferred in ACL check_recipient LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -processing "warn" (TESTSUITE/test-config 49) + H=(test) [10.0.0.0] Warning: ACL 'warn' statement skipped (in ACL check_recipient at line 44 of TESTSUITE/test-config): condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted +processing ACL check_recipient "warn" (TESTSUITE/test-config 49) check set acl_m0 = FAIL: hostlist check hosts = <& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? @@ -415,10 +416,10 @@ host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::PORT_N/test/CALLER/' lookup deferred: PostgreSQL server "localhost:PORT_N/test" is tainted host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' -warn: condition test deferred in ACL "check_recipient" +warn: condition test deferred in ACL check_recipient LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -processing "accept" (TESTSUITE/test-config 52) + H=(test) [10.0.0.0] Warning: ACL 'warn' statement skipped (in ACL check_recipient at line 49 of TESTSUITE/test-config): condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted +processing ACL check_recipient "accept" (TESTSUITE/test-config 52) check domains = +local_domains d in "+local_domains"? list element: +local_domains @@ -428,8 +429,8 @@ d in "+local_domains"? 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 53) +accept: condition test failed in ACL check_recipient +processing ACL check_recipient "accept" (TESTSUITE/test-config 53) check hosts = +relay_hosts host in "+relay_hosts"? list element: +relay_hosts @@ -452,17 +453,17 @@ host in "+relay_hosts"? host in "net-pgsql;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 54) +accept: condition test failed in ACL check_recipient +processing ACL check_recipient "deny" (TESTSUITE/test-config 54) message: relay not permitted -deny: condition test succeeded in ACL "check_recipient" -end of ACL "check_recipient": DENY +deny: condition test succeeded in ACL check_recipient +end of ACL check_recipient: DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted SMTP<< rcpt to: using ACL "check_recipient" -processing "warn" (TESTSUITE/test-config 27) +processing ACL check_recipient "warn" (TESTSUITE/test-config 27) search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -488,9 +489,10 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the type=pgsql key="select name from them where id = 'c'" opts=NULL cached data found but no_rd option set; database lookup required for select name from them where id = 'c' (tainted) +No quoter name for addr LOG: MAIN PANIC tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c' - search_type NN (pgsql) quoting -1 (none) + required_quoter_id (pgsql) quoting -1 (NULL) PostgreSQL query: "select name from them where id = 'c'" opts 'NULL' PGSQL using cached connection for localhost:PORT_N/test/CALLER PGSQL: no data found @@ -498,8 +500,8 @@ LOG: MAIN PANIC lookup failed check set acl_m0 = FAIL: ${lookup pgsql,cache=no_rd {select name from them where id = '$local_part'}} = FAIL: -warn: condition test succeeded in ACL "check_recipient" -processing "warn" (TESTSUITE/test-config 32) +warn: condition test succeeded in ACL check_recipient +processing ACL check_recipient "warn" (TESTSUITE/test-config 32) search_open: pgsql "NULL" cached open search_find: file="NULL" @@ -543,13 +545,13 @@ check set acl_m0 = ok: ${lookup pgsql,servers=localhost::PORT_N {select nam (tainted, quoted:pgsql) PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select name from them where id = 'c'" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in ACL verb at line 32 of TESTSUITE/test-config: WARNING: obsolete syntax used for lookup lookup deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -warn: condition test deferred in ACL "check_recipient" +warn: condition test deferred in ACL check_recipient LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -processing "warn" (TESTSUITE/test-config 41) + H=(test) [10.0.0.0] Warning: ACL 'warn' statement skipped (in ACL check_recipient at line 32 of TESTSUITE/test-config): condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted +processing ACL check_recipient "warn" (TESTSUITE/test-config 41) check set acl_m0 = ok: hostlist check hosts = net-pgsql;select * from them where id='${quote_pgsql:$local_part}' host in "net-pgsql;select * from them where id='c'"? @@ -564,8 +566,8 @@ host in "net-pgsql;select * from them where id='c'"? cached data used for lookup of select * from them where id='c' lookup failed host in "net-pgsql;select * from them where id='c'"? no (end of list) -warn: condition test failed in ACL "check_recipient" -processing "warn" (TESTSUITE/test-config 44) +warn: condition test failed in ACL check_recipient +processing ACL check_recipient "warn" (TESTSUITE/test-config 44) check set acl_m0 = FAIL: hostlist check hosts = <& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? @@ -581,14 +583,14 @@ host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them (tainted, quoted:pgsql) PostgreSQL query: "servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'" opts 'NULL' LOG: MAIN - Exim configuration error in line 78 of TESTSUITE/test-config: + Exim configuration error in ACL verb at line 44 of TESTSUITE/test-config: WARNING: obsolete syntax used for lookup lookup deferred: PostgreSQL server "localhost:PORT_N/test" is tainted host in "<& net-pgsql;servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='c' -warn: condition test deferred in ACL "check_recipient" +warn: condition test deferred in ACL check_recipient LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -processing "warn" (TESTSUITE/test-config 49) + H=(test) [10.0.0.0] Warning: ACL 'warn' statement skipped (in ACL check_recipient at line 44 of TESTSUITE/test-config): condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted +processing ACL check_recipient "warn" (TESTSUITE/test-config 49) check set acl_m0 = FAIL: hostlist check hosts = <& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='${quote_pgsql:$local_part}' host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? @@ -605,10 +607,10 @@ host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::PORT_N/test/CALLER/' lookup deferred: PostgreSQL server "localhost:PORT_N/test" is tainted host in "<& net-pgsql,servers=localhost::PORT_N/test/CALLER/; select * from them where id='c'"? list match deferred for net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='c' -warn: condition test deferred in ACL "check_recipient" +warn: condition test deferred in ACL check_recipient LOG: MAIN - H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted -processing "accept" (TESTSUITE/test-config 52) + H=(test) [10.0.0.0] Warning: ACL 'warn' statement skipped (in ACL check_recipient at line 49 of TESTSUITE/test-config): condition test deferred: PostgreSQL server "localhost:PORT_N/test" is tainted +processing ACL check_recipient "accept" (TESTSUITE/test-config 52) check domains = +local_domains d in "+local_domains"? list element: +local_domains @@ -618,8 +620,8 @@ d in "+local_domains"? 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 53) +accept: condition test failed in ACL check_recipient +processing ACL check_recipient "accept" (TESTSUITE/test-config 53) check hosts = +relay_hosts host in "+relay_hosts"? list element: +relay_hosts @@ -638,11 +640,11 @@ host in "+relay_hosts"? host in "net-pgsql;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 54) +accept: condition test failed in ACL check_recipient +processing ACL check_recipient "deny" (TESTSUITE/test-config 54) message: relay not permitted -deny: condition test succeeded in ACL "check_recipient" -end of ACL "check_recipient": DENY +deny: condition test succeeded in ACL check_recipient +end of ACL check_recipient: DENY SMTP>> 550 relay not permitted LOG: MAIN REJECT H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted