X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bd8fbe3606d80e5a3fc02fe71b521146c6938448..12fab4b0af476cf9d4bd389a2c4ebf7ff76e8252:/test/stderr/0465 diff --git a/test/stderr/0465 b/test/stderr/0465 index 594bd002c..5bcd5a1ce 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL set_process_info: pppp accepting a local SMTP message from @@ -16,6 +16,8 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test 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 @@ -27,20 +29,20 @@ SMTP>> 501 : domain missing or malformed 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 terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed) 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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL set_process_info: pppp accepting a local SMTP message from @@ -49,74 +51,72 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test 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 SMTP>> 250 OK SMTP<< rcpt to: -processing "accept" +processing "accept" (TESTSUITE/test-config 22) accept: condition test succeeded in inline ACL end of inline ACL: 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 -PDKIM >> raw hdr: To:{SP}abc@domain.{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: To: abc@domain. -rewrite_one_header: type=T: - To: abc@domain. +qualify & rewrite recipients list +rewrite rules on sender address +qualify and rewrite headers + rewrite_one_header: type=T: + To: abc@domain. search_tidyup called >>Headers after rewriting and local additions: -T To: abc@domain. -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: abc@domain. + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 -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 CALLER by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaY-0005vi-00 - for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} +P Received: from CALLER (helo=test) + by myhost.test.ex with local-smtp (Exim x.yz) + id 10HmaY-000000005vi-0000 + for abc@domain; + Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" -processing "accept" +processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax accept: condition test succeeded in ACL "check_data" end of ACL "check_data": ACCEPT -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -Writing spool header file: TESTSUITE/spool//input//hdr.pppp -DSN: Write SPOOL :-dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |abc@domain| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= <> U=CALLER P=local-smtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 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 terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (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=p1236 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=p1236 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL set_process_info: pppp accepting a local SMTP message from @@ -125,41 +125,46 @@ LOG: smtp_connection MAIN SMTP connection from CALLER SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test 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 SMTP>> 250 OK SMTP<< rcpt to: -processing "accept" +processing "accept" (TESTSUITE/test-config 22) accept: condition test succeeded in inline ACL end of inline ACL: 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 -PDKIM >> raw hdr: To:{SP}abc@xyz.{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: To: abc@xyz. -rewrite_one_header: type=T: - To: abc@xyz. +qualify & rewrite recipients list +rewrite rules on sender address +qualify and rewrite headers + rewrite_one_header: type=T: + To: abc@xyz. +LOG: MAIN + qualify/rewrite: domain missing or malformed search_tidyup called >>Headers after rewriting and local additions: -T To: abc@xyz. -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: abc@xyz. + I Message-Id: + 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-smtp (Exim x.yz) - id 10HmaX-0005vi-00 - for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} +P Received: from CALLER (helo=test) + by myhost.test.ex with local-smtp (Exim x.yz) + id 10HmaX-000000005vi-0000 + for abc@xyz; + Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" -processing "accept" +processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax accept: condition test failed in ACL "check_data" end of ACL "check_data": implicit DENY @@ -170,6 +175,6 @@ 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 terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>