X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2f8e0a5f6bc17ccd0749c0dc28f5da28da5d25a2..c90c2288e88f66ae1d8af198cfa56c401e573ce4:/test/stderr/0386 diff --git a/test/stderr/0386 b/test/stderr/0386 index a94214bbc..ace0dc69c 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -1,13 +1,13 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -28,6 +28,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) [V4NET.9.8.7] sender_rcvhost = [V4NET.9.8.7] (helo=test) @@ -41,16 +44,24 @@ SMTP<< rcpt to:<1@b> using ACL "chk_rcpt" processing "accept" (TESTSUITE/test-config 18) check local_parts = 1 -1 in "1"? yes (matched "1") +1 in "1"? + list element: 1 + 1 in "1"? yes (matched "1") check acl = TESTSUITE/aux-fixed/0386.acl1 read ACL from file TESTSUITE/aux-fixed/0386.acl1 processing "accept" (TESTSUITE/test-config 44) check hosts = : -host in ":"? no (end of list) + host in ":"? + list element: + host in ":"? no (end of list) accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" (TESTSUITE/test-config 44) check local_parts = ^.*[@%!/|] -1 in "^.*[@%!/|]"? no (end of list) + 1 in "^.*[@%!/|]"? + list element: ^.*[@%!/|] + compiled caseless RE '^.*[@%!/|]' not found in local cache + compiled RE '^.*[@%!/|]' saved in local cache + 1 in "^.*[@%!/|]"? no (end of list) deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "require" (TESTSUITE/test-config 44) l_message: Invalid sender @@ -97,16 +108,23 @@ SMTP<< rcpt to:<1@b> using ACL "chk_rcpt" processing "accept" (TESTSUITE/test-config 18) check local_parts = 1 -1 in "1"? yes (matched "1") +1 in "1"? + list element: 1 + 1 in "1"? yes (matched "1") check acl = TESTSUITE/aux-fixed/0386.acl1 using ACL "TESTSUITE/aux-fixed/0386.acl1" processing "accept" (TESTSUITE/test-config 44) check hosts = : -host in ":"? no (end of list) + host in ":"? + list element: + host in ":"? no (end of list) accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "deny" (TESTSUITE/test-config 44) check local_parts = ^.*[@%!/|] -1 in "^.*[@%!/|]"? no (end of list) + 1 in "^.*[@%!/|]"? + list element: ^.*[@%!/|] + compiled caseless RE '^.*[@%!/|]' found in local cache + 1 in "^.*[@%!/|]"? no (end of list) deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" processing "require" (TESTSUITE/test-config 44) l_message: Invalid sender @@ -145,19 +163,19 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config trusted user admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -180,6 +198,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) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -193,11 +214,15 @@ SMTP<< rcpt to:<2@b> using ACL "chk_rcpt" processing "accept" (TESTSUITE/test-config 18) check local_parts = 1 +2 in "1"? + list element: 1 2 in "1"? no (end of list) accept: condition test failed in ACL "chk_rcpt" processing "accept" (TESTSUITE/test-config 21) check local_parts = 2 -2 in "2"? yes (matched "2") +2 in "2"? + list element: 2 + 2 in "2"? yes (matched "2") check acl = TESTSUITE/aux-fixed/0386.acl2 read ACL from file TESTSUITE/aux-fixed/0386.acl2 processing "warn" (TESTSUITE/test-config 44) @@ -228,34 +253,37 @@ SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: +qualify & rewrite recipients list +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: -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 [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for 2@b; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -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: <2@b> 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 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 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=pppp + uid=uuuu gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -265,9 +293,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": using cached result 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=x@y sender_fullhost = (test) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -326,9 +354,9 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to 2 using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 2 using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/2 format=unix @@ -356,8 +384,8 @@ LOG: MAIN => 2 <2@b> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1236 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: 2@b: no retry items @@ -374,10 +402,10 @@ 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=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< rset SMTP>> 250 Reset OK @@ -389,11 +417,15 @@ SMTP<< rcpt to:<2@b> using ACL "chk_rcpt" processing "accept" (TESTSUITE/test-config 18) check local_parts = 1 +2 in "1"? + list element: 1 2 in "1"? no (end of list) accept: condition test failed in ACL "chk_rcpt" processing "accept" (TESTSUITE/test-config 21) check local_parts = 2 -2 in "2"? yes (matched "2") +2 in "2"? + list element: 2 + 2 in "2"? yes (matched "2") check acl = TESTSUITE/aux-fixed/0386.acl2 using ACL "TESTSUITE/aux-fixed/0386.acl2" processing "warn" (TESTSUITE/test-config 44) @@ -418,34 +450,37 @@ SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: +qualify & rewrite recipients list +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for 2@b; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <2@b> errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID configuration file is TESTSUITE/test-config @@ -455,9 +490,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = (test) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -516,9 +551,9 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to 2 using t1 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to 2 using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/2 format=unix @@ -546,8 +581,8 @@ LOG: MAIN => 2 <2@b> R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1238 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: 2@b: no retry items @@ -564,14 +599,14 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>