X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/632b9f8daa4c1c9c417787ff49b0b9fcd1c6fd99..85f4056d71b45977bf269c7e595386647538d14b:/test/stderr/0465 diff --git a/test/stderr/0465 b/test/stderr/0465 index 3f4af9827..bcf5f0393 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 @@ -29,18 +31,18 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER 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 @@ -49,6 +51,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 @@ -64,8 +68,11 @@ search_tidyup called >>Headers received: To: abc@domain. -rewrite_one_header: type=T: - To: abc@domain. +qualify & rewrite recipients list +global rewrite rules +rewrite headers + rewrite_one_header: type=T: + To: abc@domain. search_tidyup called >>Headers after rewriting and local additions: T To: abc@domain. @@ -75,9 +82,11 @@ I Message-Id: 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 CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + 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 + for abc@domain; + Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax @@ -97,17 +106,17 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER 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 @@ -116,6 +125,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 @@ -131,8 +142,11 @@ search_tidyup called >>Headers received: To: abc@xyz. -rewrite_one_header: type=T: - To: abc@xyz. +qualify & rewrite recipients list +global rewrite rules +rewrite headers + rewrite_one_header: type=T: + To: abc@xyz. search_tidyup called >>Headers after rewriting and local additions: T To: abc@xyz. @@ -142,9 +156,11 @@ I Message-Id: 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 CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + 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 + for abc@xyz; + Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax @@ -159,4 +175,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>