summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Jetmore <jj33@pobox.com>2010-06-08 13:05:51 +0000
committerJohn Jetmore <jj33@pobox.com>2010-06-08 13:05:51 +0000
commitd767f9fff63eda0419dcff64930c3f857ea2c560 (patch)
tree470acbe790076bcea24c9e1fce0c588d2a789ad7
parent655c589513d20178c1979517320fc446f1a197f6 (diff)
downloadexim4-d767f9fff63eda0419dcff64930c3f857ea2c560.tar.gz
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)
-rw-r--r--test/log/510110
-rw-r--r--test/stdout/03902
2 files changed, 7 insertions, 5 deletions
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 <CALLER@myhost.test.ex>)
<<< id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
-<<< Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
<<< mailbox: copied
+<<< Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
<<< From: CALLER_NAME <CALLER@myhost.test.ex>
+<<< 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 <CALLER@myhost.test.ex>)
<<< id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
<<< Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
<<< From: CALLER_NAME <CALLER@myhost.test.ex>
+<<< 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 <userx@myhost.test.ex> 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 <userx@myhost.test.ex> 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 <jill@myhost.test.ex> 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 <jill@myhost.test.ex> 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 <CALLER@myhost.test.ex> 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