From: John Jetmore Date: Tue, 8 Jun 2010 13:05:51 +0000 (+0000) Subject: log/5101 - header order, plus new wording for appendfile to dir from MBX security... X-Git-Tag: exim-4_73_RC0~37 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d767f9fff63eda0419dcff64930c3f857ea2c560;p=exim.git log/5101 - header order, plus new wording for appendfile to dir from MBX security checks stdout/0390 - allow for new option permit_coredump in output (from bug 834) --- diff --git a/test/log/5101 b/test/log/5101 index c0c3856b3..a24a5aae8 100644 --- a/test/log/5101 +++ b/test/log/5101 @@ -23,10 +23,10 @@ DATA <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz) <<< (envelope-from ) <<< id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 -<<< Message-Id: <<< mailbox: copied +<<< Message-Id: <<< From: CALLER_NAME +<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< <<< This is a test message. <<< Here's a new line. @@ -69,9 +69,9 @@ DATA <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz) <<< (envelope-from ) <<< id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< Message-Id: <<< From: CALLER_NAME +<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< <<< This is another test message. <<< Here's a new line. @@ -82,9 +82,9 @@ DATA QUIT <<< QUIT 250 OK -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ is not a regular file) +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ has too many links (2)) 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** jack@myhost.test.ex R=smartuser T=lmtp: LMTP error after end of data: 550 Number 2 fails -1999-03-02 09:44:33 10HmaZ-0005vi-00 -> jill R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ is not a regular file) +1999-03-02 09:44:33 10HmaZ-0005vi-00 -> jill R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ has too many links (2)) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER R=bounces T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/stdout/0390 b/test/stdout/0390 index c33eb534c..e3af3d1b1 100644 --- a/test/stdout/0390 +++ b/test/stdout/0390 @@ -78,6 +78,7 @@ max_output = 20K message_prefix = From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n message_suffix = \n path = /bin:/usr/bin +no_permit_coredump no_pipe_as_creator no_restrict_to_path no_return_fail_output @@ -129,6 +130,7 @@ max_output = 20K message_prefix = From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n message_suffix = \n path = /bin:/usr/bin +no_permit_coredump no_pipe_as_creator no_restrict_to_path no_return_fail_output