X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3db72f4b639a64cacf152e4f7718a18581426b10..b7c6d0ccbc57c958954205b2c9d70528b9688c1a:/test/stderr/2620
diff --git a/test/stderr/2620 b/test/stderr/2620
index eee26190d..992a60904 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -240,6 +240,12 @@ host in helo_try_verify_hosts? no (option unset)
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? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -264,16 +270,46 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the
search_open: pgsql "NULL"
cached open
search_find: file="NULL"
- key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+ key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/"
LRU list:
internal_search_find: file="NULL"
- type=pgsql key="select name from them where id = 'c'" opts="servers=SSPEC"
+ type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223/test/CALLER/"
cached data found but wrong opts; database lookup required for select name from them where id = 'c'
- PostgreSQL query: "select name from them where id = 'c'" opts 'servers=SSPEC'
- lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223/test/CALLER/'
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: no data found
+ replacing old cache entry
+ lookup failed
+check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223/test/CALLER/ {select name from them where id = '$local_part'}}
+ = ok:
+ search_open: pgsql "NULL"
+ cached open
+ search_find: file="NULL"
+ key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223"
+ LRU list:
+ internal_search_find: file="NULL"
+ type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223"
+ cached data found but wrong opts; database lookup required for select name from them where id = 'c'
+ PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223'
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: no data found
+ replacing old cache entry
+ lookup failed
+check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223 {select name from them where id = '$local_part'}}
+ = ok:
+ search_open: pgsql "NULL"
+ cached open
+ search_find: file="NULL"
+ key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+ type=pgsql key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts=NULL
+ database lookup required for servers=localhost::1223/test/CALLER/; select name from them where id = 'c'
+ PostgreSQL query: "servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts 'NULL'
+ lookup deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
processing "warn" (TESTSUITE/test-config 38)
check set acl_m0 = ok: hostlist
check hosts = net-pgsql;select * from them where id='$local_part'
@@ -294,38 +330,38 @@ 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 41)
check set acl_m0 = FAIL: hostlist
-check hosts = <& net-pgsql;servers=SSPEC; select * from them where id='$local_part'
+check hosts = <& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='$local_part'
search_open: pgsql "NULL"
cached open
search_find: file="NULL"
- key="servers=SSPEC; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
+ key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
LRU list:
internal_search_find: file="NULL"
- type=pgsql key="servers=SSPEC; select * from them where id='c'" opts=NULL
-database lookup required for servers=SSPEC; select * from them where id='c'
-PostgreSQL query: "servers=SSPEC; select * from them where id='c'" opts 'NULL'
-lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
-host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
+ type=pgsql key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts=NULL
+database lookup required for servers=localhost::1223/test/CALLER/; select * from them where id='c'
+PostgreSQL query: "servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts 'NULL'
+lookup deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
+host in "<& net-pgsql;servers=localhost::1223/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"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
processing "warn" (TESTSUITE/test-config 46)
check set acl_m0 = FAIL: hostlist
-check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
+check hosts = <& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='$local_part'
search_open: pgsql "NULL"
cached open
search_find: file="NULL"
- key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+ key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/"
LRU list:
internal_search_find: file="NULL"
- type=pgsql key=" select * from them where id='c'" opts="servers=SSPEC"
+ type=pgsql key=" select * from them where id='c'" opts="servers=localhost::1223/test/CALLER/"
database lookup required for select * from them where id='c'
-PostgreSQL query: " select * from them where id='c'" opts 'servers=SSPEC'
-lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
-host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
+PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::1223/test/CALLER/'
+lookup deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
+host in "<& net-pgsql,servers=localhost::1223/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"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
processing "accept" (TESTSUITE/test-config 49)
check domains = +local_domains
d in "@"? no (end of list)
@@ -355,7 +391,7 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F= rejected RCPT : relay not permitted
+ 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)
@@ -366,23 +402,57 @@ processing "warn" (TESTSUITE/test-config 27)
LRU list:
internal_search_find: file="NULL"
type=pgsql key="select name from them where id = 'c'" opts=NULL
- cached data used for lookup of select name from them where id = 'c'
+ cached data found but wrong opts; database lookup required for select name from them where id = 'c'
+ PostgreSQL query: "select name from them where id = 'c'" opts 'NULL'
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: no data found
+ replacing old cache entry
lookup failed
check set acl_m0 = ok: ${lookup pgsql {select name from them where id = '$local_part'}}
= ok:
search_open: pgsql "NULL"
cached open
search_find: file="NULL"
- key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+ key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/"
+ LRU list:
+ internal_search_find: file="NULL"
+ type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223/test/CALLER/"
+ cached data found but wrong opts; database lookup required for select name from them where id = 'c'
+ PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223/test/CALLER/'
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: no data found
+ replacing old cache entry
+ lookup failed
+check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223/test/CALLER/ {select name from them where id = '$local_part'}}
+ = ok:
+ search_open: pgsql "NULL"
+ cached open
+ search_find: file="NULL"
+ key="select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223"
LRU list:
internal_search_find: file="NULL"
- type=pgsql key="select name from them where id = 'c'" opts="servers=SSPEC"
+ type=pgsql key="select name from them where id = 'c'" opts="servers=localhost::1223"
cached data found but wrong opts; database lookup required for select name from them where id = 'c'
- PostgreSQL query: "select name from them where id = 'c'" opts 'servers=SSPEC'
- lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ PostgreSQL query: "select name from them where id = 'c'" opts 'servers=localhost::1223'
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: no data found
+ replacing old cache entry
+ lookup failed
+check set acl_m0 = ok: ${lookup pgsql,servers=localhost::1223 {select name from them where id = '$local_part'}}
+ = ok:
+ search_open: pgsql "NULL"
+ cached open
+ search_find: file="NULL"
+ key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+ type=pgsql key="servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts=NULL
+ database lookup required for servers=localhost::1223/test/CALLER/; select name from them where id = 'c'
+ PostgreSQL query: "servers=localhost::1223/test/CALLER/; select name from them where id = 'c'" opts 'NULL'
+ lookup deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
warn: condition test deferred in ACL "check_recipient"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
processing "warn" (TESTSUITE/test-config 38)
check set acl_m0 = ok: hostlist
check hosts = net-pgsql;select * from them where id='$local_part'
@@ -399,38 +469,38 @@ 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 41)
check set acl_m0 = FAIL: hostlist
-check hosts = <& net-pgsql;servers=SSPEC; select * from them where id='$local_part'
+check hosts = <& net-pgsql;servers=localhost::1223/test/CALLER/; select * from them where id='$local_part'
search_open: pgsql "NULL"
cached open
search_find: file="NULL"
- key="servers=SSPEC; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
+ key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts=NULL
LRU list:
internal_search_find: file="NULL"
- type=pgsql key="servers=SSPEC; select * from them where id='c'" opts=NULL
-database lookup required for servers=SSPEC; select * from them where id='c'
-PostgreSQL query: "servers=SSPEC; select * from them where id='c'" opts 'NULL'
-lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
-host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
+ type=pgsql key="servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts=NULL
+database lookup required for servers=localhost::1223/test/CALLER/; select * from them where id='c'
+PostgreSQL query: "servers=localhost::1223/test/CALLER/; select * from them where id='c'" opts 'NULL'
+lookup deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
+host in "<& net-pgsql;servers=localhost::1223/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"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
processing "warn" (TESTSUITE/test-config 46)
check set acl_m0 = FAIL: hostlist
-check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
+check hosts = <& net-pgsql,servers=localhost::1223/test/CALLER/; select * from them where id='$local_part'
search_open: pgsql "NULL"
cached open
search_find: file="NULL"
- key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=SSPEC"
+ key=" select * from them where id='c'" partial=-1 affix=NULL starflags=0 opts="servers=localhost::1223/test/CALLER/"
LRU list:
internal_search_find: file="NULL"
- type=pgsql key=" select * from them where id='c'" opts="servers=SSPEC"
+ type=pgsql key=" select * from them where id='c'" opts="servers=localhost::1223/test/CALLER/"
database lookup required for select * from them where id='c'
-PostgreSQL query: " select * from them where id='c'" opts 'servers=SSPEC'
-lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
-host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
+PostgreSQL query: " select * from them where id='c'" opts 'servers=localhost::1223/test/CALLER/'
+lookup deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
+host in "<& net-pgsql,servers=localhost::1223/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"
LOG: MAIN
- H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+ H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: Tainted PostgreSQL server 'localhost:1223/test/CALLER/'
processing "accept" (TESTSUITE/test-config 49)
check domains = +local_domains
d in "@"? no (end of list)
@@ -456,11 +526,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F= rejected RCPT : relay not permitted
+ H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
close PGSQL connection: localhost:1223/test/CALLER
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -498,7 +568,8 @@ Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
(envelope-from )
id 10HmaX-0005vi-00
- for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ for CALLER@myhost.test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -524,11 +595,11 @@ reading spool file 10HmaX-0005vi-00-H
user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
sender_local=1 ident=CALLER
Non-recipients:
-Empty Tree
+ Empty Tree
---- End of tree ----
recipients_count=1
**** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
DSN: set orcpt: flags: 0x0
Delivery address list:
CALLER@myhost.test.ex
@@ -536,8 +607,7 @@ Delivery address list:
locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN: file dir flags=O_RDONLY
returned from EXIM_DBOPEN: (nil)
- ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
- failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
@@ -568,7 +638,7 @@ set transport t1
queued for t1 transport: local_part = CALLER
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local_part_data=NULL
routed by r1 router
envelope to: CALLER@myhost.test.ex
transport: t1