X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4da19af657ed2687d20c1eb8cf85a66a70804e2d..6fcb3173d64ef8a9d70f8adf19f134a0cd9cf6e8:/test/stderr/2600?ds=sidebyside diff --git a/test/stderr/2600 b/test/stderr/2600 index b396f2a74..a81e20da0 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -162,6 +162,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) @@ -175,22 +178,34 @@ SMTP<< rcpt to: using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) 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 33) 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 opts="file=TESTSUITE/aux-fixed/sqlitedb" -LRU list: -internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='10.0.0.0'" opts="file=TESTSUITE/aux-fixed/sqlitedb" -file lookup required for select * from them where id='10.0.0.0' - in TESTSUITE/aux-fixed/sqlitedb -lookup forced cache cleanup -lookup failed -host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; 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 "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"? + ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0' + ╎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 opts="file=TESTSUITE/aux-fixed/sqlitedb" + ╎LRU list: + ╎internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" + ╎ type=sqlite key="select * from them where id='10.0.0.0'" opts="file=TESTSUITE/aux-fixed/sqlitedb" + ╎file lookup required for select * from them where id='10.0.0.0' + ╎ in TESTSUITE/aux-fixed/sqlitedb + ╎lookup forced cache cleanup + ╎lookup failed + host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; 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 34) @@ -204,23 +219,35 @@ SMTP<< rcpt to: using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) 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 33) 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 opts="file=TESTSUITE/aux-fixed/sqlitedb" -LRU list: -internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - type=sqlite key="select * from them where id='10.0.0.0'" opts="file=TESTSUITE/aux-fixed/sqlitedb" -file lookup required for select * from them where id='10.0.0.0' - in TESTSUITE/aux-fixed/sqlitedb -lookup forced cache cleanup -lookup failed -host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; 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 "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0'"? + ╎list element: sqlite,file=TESTSUITE/aux-fixed/sqlitedb; select * from them where id='10.0.0.0' + ╎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 opts="file=TESTSUITE/aux-fixed/sqlitedb" + ╎LRU list: + ╎internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" + ╎ type=sqlite key="select * from them where id='10.0.0.0'" opts="file=TESTSUITE/aux-fixed/sqlitedb" + ╎file lookup required for select * from them where id='10.0.0.0' + ╎ in TESTSUITE/aux-fixed/sqlitedb + ╎lookup forced cache cleanup + ╎lookup failed + host in "sqlite,file=TESTSUITE/aux-fixed/sqlitedb; 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 34) @@ -233,7 +260,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 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -263,6 +290,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) @@ -276,22 +306,34 @@ SMTP<< rcpt to: using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) 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 33) 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 opts=NULL -LRU list: -internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - 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 -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"? + list element: +relay_hosts + start sublist relay_hosts + host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0' + ╎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 opts=NULL + ╎LRU list: + ╎internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" + ╎ 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 + ╎lookup failed + host in "sqlite;TESTSUITE/aux-fixed/sqlitedb 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 34) @@ -305,23 +347,35 @@ SMTP<< rcpt to: using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) 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 33) 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 opts=NULL -LRU list: -internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - 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 -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"? + list element: +relay_hosts + start sublist relay_hosts + host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0'"? + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.0.0.0' + ╎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 opts=NULL + ╎LRU list: + ╎internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" + ╎ 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 + ╎lookup failed + host in "sqlite;TESTSUITE/aux-fixed/sqlitedb 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 34) @@ -334,7 +388,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 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -364,6 +418,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.10.10.10] sender_rcvhost = [10.10.10.10] (helo=test) @@ -377,23 +434,35 @@ SMTP<< rcpt to: using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) 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 33) 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 opts=NULL -LRU list: -internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - 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 -creating new cache entry -lookup yielded: name=ok id=10.10.10.10 -host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") -host in "+relay_hosts"? yes (matched "+relay_hosts") +host in "+relay_hosts"? + list element: +relay_hosts + start sublist relay_hosts + host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10' + ╎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 opts=NULL + ╎LRU list: + ╎internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" + ╎ 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 + ╎creating new cache entry + ╎lookup yielded: name=ok id=10.10.10.10 + ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") + end sublist relay_hosts + host in "+relay_hosts"? yes (matched "+relay_hosts") accept: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": ACCEPT SMTP>> 250 Accepted @@ -401,30 +470,42 @@ SMTP<< rcpt to: using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 32) 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 33) 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 opts=NULL -LRU list: -internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" - 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 -host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") -host in "+relay_hosts"? yes (matched "+relay_hosts") +host in "+relay_hosts"? + list element: +relay_hosts + start sublist relay_hosts + host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? + ╎list element: sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10' + ╎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 opts=NULL + ╎LRU list: + ╎internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb" + ╎ 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 + ╎host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'") + end sublist relay_hosts + host in "+relay_hosts"? yes (matched "+relay_hosts") accept: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": ACCEPT SMTP>> 250 Accepted SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [10.10.10.10] closed by QUIT + SMTP connection from (test) [10.10.10.10] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -448,33 +529,33 @@ 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 userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -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 -DOPT=y -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -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=p1239 @@ -485,9 +566,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: @@ -557,7 +638,7 @@ search_tidyup called changed uid/gid: local delivery to userx transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -595,7 +676,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1239 -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: userx@myhost.test.ex: no retry items @@ -612,7 +693,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=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>