X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ef8ef6c168a552e61ecde1d8d2cd816f2e87614b..70918f02eecc64d5033b9831a393f2eca3c4709d:/test/stderr/0386 diff --git a/test/stderr/0386 b/test/stderr/0386 index e4dd3bef5..a94214bbc 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -27,6 +27,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) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] 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 @@ -38,15 +44,15 @@ check local_parts = 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 43) + processing "accept" (TESTSUITE/test-config 44) check hosts = : host in ":"? no (end of list) accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" - processing "deny" (TESTSUITE/test-config 43) + processing "deny" (TESTSUITE/test-config 44) check local_parts = ^.*[@%!/|] 1 in "^.*[@%!/|]"? no (end of list) deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" - processing "require" (TESTSUITE/test-config 43) + processing "require" (TESTSUITE/test-config 44) l_message: Invalid sender message: Couldn't verify the sender check verify = sender/defer_ok @@ -65,14 +71,14 @@ set transport t1 queued for t1 transport: local_part = x domain = y errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: x@y transport: t1 ----------- end verify ------------ sender x@y verified ok require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" - processing "deny" (TESTSUITE/test-config 43) + processing "deny" (TESTSUITE/test-config 44) message: No such user here deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" end of ACL "TESTSUITE/aux-fixed/0386.acl1": DENY @@ -80,7 +86,7 @@ accept: condition test failed in ACL "chk_rcpt" accept: endpass encountered - denying access SMTP>> 550 No such user here LOG: MAIN REJECT - H=[V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here + H=(test) [V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from: @@ -94,15 +100,15 @@ check local_parts = 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 43) + processing "accept" (TESTSUITE/test-config 44) check hosts = : host in ":"? no (end of list) accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" - processing "deny" (TESTSUITE/test-config 43) + processing "deny" (TESTSUITE/test-config 44) check local_parts = ^.*[@%!/|] 1 in "^.*[@%!/|]"? no (end of list) deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1" - processing "require" (TESTSUITE/test-config 43) + processing "require" (TESTSUITE/test-config 44) l_message: Invalid sender message: Couldn't verify the sender check verify = sender/defer_ok @@ -120,14 +126,14 @@ r1 router called for x@y queued for t1 transport: local_part = x domain = y errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: x@y transport: t1 ----------- end verify ------------ sender x@y verified ok require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" - processing "deny" (TESTSUITE/test-config 43) + processing "deny" (TESTSUITE/test-config 44) message: No such user here deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1" end of ACL "TESTSUITE/aux-fixed/0386.acl1": DENY @@ -135,11 +141,11 @@ accept: condition test failed in ACL "chk_rcpt" accept: endpass encountered - denying access SMTP>> 550 No such user here LOG: MAIN REJECT - H=[V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here + H=(test) [V4NET.9.8.7] F= rejected RCPT <1@b>: No such user here SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -173,6 +179,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) [V4NET.11.12.13] +sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) +set_process_info: pppp handling incoming connection from (test) [V4NET.11.12.13] U=CALLER +SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13] 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 @@ -188,7 +200,7 @@ check local_parts = 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 43) + processing "warn" (TESTSUITE/test-config 44) message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text l_message: found in $dnslist_domain: $dnslist_text check dnslists = rbl.test.ex @@ -203,15 +215,14 @@ DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded => that means V4NET.11.12.13 is listed at rbl.test.ex warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN - H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message + H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message created log directory TESTSUITE/spool/log - processing "accept" (TESTSUITE/test-config 43) + processing "accept" (TESTSUITE/test-config 44) accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT accept: condition test succeeded in ACL "chk_rcpt" end of ACL "chk_rcpt": ACCEPT SMTP>> 250 Accepted -DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called @@ -223,29 +234,25 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.11.12.13] (ident=CALLER) +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 - for 2@b; Tue, 2 Mar 1999 09:44:33 +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 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: <2@b> errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN - <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss + <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss SMTP>> 250 OK id=10HmaX-0005vi-00 search_tidyup called -fresh-exec forking for local-accept-delivery exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -262,15 +269,15 @@ 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 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y -sender_fullhost = [V4NET.11.12.13] -sender_rcvhost = [V4NET.11.12.13] (ident=CALLER) +sender_fullhost = (test) [V4NET.11.12.13] +sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) sender_local=0 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: 2@b @@ -278,8 +285,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: 2@b @@ -298,7 +304,7 @@ set transport t1 queued for t1 transport: local_part = 2 domain = b errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: 2@b transport: t1 @@ -319,7 +325,6 @@ search_tidyup called failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called -local-accept-delivery forking for delivery-local changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -331,6 +336,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 message_suffix=\n maildir_use_size_file=no locking by lockfile fcntl +de-tainting path 'TESTSUITE/test-mail/2' lock name: TESTSUITE/test-mail/2.lock hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created @@ -342,7 +348,6 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling 2@b t1 transport returned OK for 2@b post-process 2@b (0) @@ -391,7 +396,7 @@ check local_parts = 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 43) + processing "warn" (TESTSUITE/test-config 44) message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text l_message: found in $dnslist_domain: $dnslist_text check dnslists = rbl.test.ex @@ -401,14 +406,13 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) => that means V4NET.11.12.13 is listed at rbl.test.ex warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN - H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message - processing "accept" (TESTSUITE/test-config 43) + H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message + processing "accept" (TESTSUITE/test-config 44) accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT accept: condition test succeeded in ACL "chk_rcpt" end of ACL "chk_rcpt": ACCEPT SMTP>> 250 Accepted -DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called @@ -420,29 +424,25 @@ search_tidyup called Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.11.12.13] (ident=CALLER) +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 - for 2@b; Tue, 2 Mar 1999 09:44:33 +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 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: <2@b> errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN - <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss + <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss SMTP>> 250 OK id=10HmaY-0005vi-00 search_tidyup called -fresh-exec forking for local-accept-delivery exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -459,15 +459,15 @@ 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 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y -sender_fullhost = [V4NET.11.12.13] -sender_rcvhost = [V4NET.11.12.13] (ident=CALLER) +sender_fullhost = (test) [V4NET.11.12.13] +sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) sender_local=0 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: 2@b @@ -494,7 +494,7 @@ set transport t1 queued for t1 transport: local_part = 2 domain = b errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: 2@b transport: t1 @@ -515,7 +515,6 @@ search_tidyup called failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called -local-accept-delivery forking for delivery-local changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -527,6 +526,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 message_suffix=\n maildir_use_size_file=no locking by lockfile fcntl +de-tainting path 'TESTSUITE/test-mail/2' lock name: TESTSUITE/test-mail/2.lock hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created @@ -538,7 +538,6 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling 2@b t1 transport returned OK for 2@b post-process 2@b (0)