X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/376d3790ba2756278e28d0ecaa1ed7c9b1a0ab00..f2738aab2d72569b6d47b788099f6ebab701b2b2:/test/stderr/0465?ds=sidebyside diff --git a/test/stderr/0465 b/test/stderr/0465 index ae038dfff..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 @@ -29,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 (fresh-exec) 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 @@ -69,22 +69,22 @@ search_tidyup called To: abc@domain. qualify & rewrite recipients list -global rewrite rules -rewrite headers +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 (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" @@ -92,31 +92,31 @@ processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax accept: condition test succeeded in ACL "check_data" end of ACL "check_data": ACCEPT -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: 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 <= <> 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 (fresh-exec) 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 @@ -143,22 +143,24 @@ search_tidyup called To: abc@xyz. qualify & rewrite recipients list -global rewrite rules -rewrite headers +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 (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" @@ -173,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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>