From 1a6230a33e235e2b008caabd112f8bc6cb1bcc60 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 30 May 2016 22:20:33 +0100 Subject: Avoid writing msglog files in -bh and -bhc modes. Bug 1804 --- test/stderr/0420 | 82 +------------------------------------------------------- test/stderr/0575 | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 81 deletions(-) create mode 100644 test/stderr/0575 (limited to 'test/stderr') diff --git a/test/stderr/0420 b/test/stderr/0420 index 1bf978723..045fadc9b 100644 --- a/test/stderr/0420 +++ b/test/stderr/0420 @@ -1,82 +1,2 @@ -Exim version x.yz .... -changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp -configuration file is TESTSUITE/test-config -admin user -changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp -originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -sender address = CALLER@test.ex -sender_fullhost = [V4NET.0.0.0] -sender_rcvhost = [V4NET.0.0.0] -host in hosts_connection_nolog? no (option unset) -LOG: smtp_connection MAIN - SMTP connection from [V4NET.0.0.0] -host in host_lookup? no (option unset) -set_process_info: pppp handling incoming connection from [V4NET.0.0.0] -host in host_reject_connection? no (option unset) -host in sender_unqualified_hosts? no (option unset) -host in recipient_unqualified_hosts? no (option unset) -host in helo_verify_hosts? no (option unset) -host in helo_try_verify_hosts? no (option unset) -host in helo_accept_junk_hosts? no (option unset) -SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -smtp_setup_msg entered -SMTP<< mail from: -SMTP>> 250 OK -SMTP<< rcpt to: -processing "accept" -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 -host in ignore_fromline_hosts? no (option unset) ->>Headers received: -search_tidyup called ->>Headers after rewriting and local additions: - -Data file written for message 10HmaX-0005vi-00 ->>Generated Received: header line -* Received: ; Tue, 2 Mar 1999 09:44:33 +0000 -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -LOG: MAIN - <= x@y H=[V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 -smtp_setup_msg entered -SMTP<< mail from: -SMTP>> 250 OK -SMTP<< rcpt to: -processing "accept" -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 -host in ignore_fromline_hosts? no (option unset) ->>Headers received: - -search_tidyup called ->>Headers after rewriting and local additions: - -Data file written for message 10HmaY-0005vi-00 ->>Generated Received: header line -P Received: some text; Tue, 2 Mar 1999 09:44:33 +0000 -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -LOG: MAIN - <= a@b H=[V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 -smtp_setup_msg entered -SMTP<< quit -SMTP>> 221 mail.test.ex closing connection -LOG: smtp_connection MAIN - SMTP connection from [V4NET.0.0.0] closed by QUIT -search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +******** SERVER ******** diff --git a/test/stderr/0575 b/test/stderr/0575 new file mode 100644 index 000000000..4c1a4c099 --- /dev/null +++ b/test/stderr/0575 @@ -0,0 +1,60 @@ +Exim version x.yz .... +changed uid/gid: forcing real = effective + uid=uuuu gid=CALLER_GID pid=pppp +configuration file is TESTSUITE/test-config +admin user +changed uid/gid: privilege not needed + uid=EXIM_UID gid=EXIM_GID pid=pppp +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME +sender address = CALLER@test.ex +sender_fullhost = [V4NET.0.0.0] +sender_rcvhost = [V4NET.0.0.0] +host in hosts_connection_nolog? no (option unset) +LOG: smtp_connection MAIN + SMTP connection from [V4NET.0.0.0] +host in host_lookup? no (option unset) +set_process_info: pppp handling incoming connection from [V4NET.0.0.0] +host in host_reject_connection? no (option unset) +host in sender_unqualified_hosts? no (option unset) +host in recipient_unqualified_hosts? no (option unset) +host in helo_verify_hosts? no (option unset) +host in helo_try_verify_hosts? no (option unset) +host in helo_accept_junk_hosts? no (option unset) +SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +smtp_setup_msg entered +SMTP<< mail from: +SMTP>> 250 OK +SMTP<< rcpt to: +processing "accept" +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 +host in ignore_fromline_hosts? no (option unset) +>>Headers received: + +search_tidyup called +>>Headers after rewriting and local additions: + +Data file written for message 10HmaX-0005vi-00 +>>Generated Received: header line +P Received: from [V4NET.0.0.0] + by mail.test.ex with smtp (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for x@y; Tue, 2 Mar 1999 09:44:33 +0000 +calling local_scan(); timeout=300 +local_scan() returned 0 NULL +LOG: MAIN + <= x@y H=[V4NET.0.0.0] P=smtp S=sss +SMTP>> 250 OK id=10HmaX-0005vi-00 +smtp_setup_msg entered +SMTP<< quit +SMTP>> 221 mail.test.ex closing connection +LOG: smtp_connection MAIN + SMTP connection from [V4NET.0.0.0] closed by QUIT +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -- cgit v1.2.3