Merge branch 'master' of git://git.exim.org/exim

[users/jgh/exim.git] / test / stdout / 0390

diff --git a/test/stdout/0390 b/test/stdout/0390
index c33eb534c61ded52ff5e923bc38e6bc47691b86d..a80e34c38b5eb6ed603e32323425ad873e72acaf 100644 (file)
--- a/test/stdout/0390
+++ b/test/stdout/0390
@@ -1,4 +1,4 @@
-no_accept_8bitmime
+accept_8bitmime

 acl_not_smtp = xxx
 acl_smtp_auth = 
 acl_smtp_connect = 
 acl_not_smtp = xxx
 acl_smtp_auth = 
 acl_smtp_connect = 


@@ -8,7 +8,7 @@ acl_smtp_expn = zzz
 acl_smtp_mail = yyy
 acl_smtp_rcpt = 
 acl_smtp_vrfy = 
 acl_smtp_mail = yyy
 acl_smtp_rcpt = 
 acl_smtp_vrfy = 

-accept_8bitmime
+no_accept_8bitmime

 acl_not_smtp = 
 acl_smtp_auth = xxx
 acl_smtp_connect = xxx
 acl_not_smtp = 
 acl_smtp_auth = xxx
 acl_smtp_connect = xxx


@@ -18,7 +18,7 @@ acl_smtp_expn =
 acl_smtp_mail = xxx
 acl_smtp_rcpt = 
 acl_smtp_vrfy = 
 acl_smtp_mail = xxx
 acl_smtp_rcpt = 
 acl_smtp_vrfy = 

-no_accept_8bitmime
+accept_8bitmime

 acl_not_smtp = xxx
 acl_smtp_auth = xxx
 acl_smtp_connect = yyy
 acl_not_smtp = xxx
 acl_smtp_auth = xxx
 acl_smtp_connect = yyy


@@ -28,7 +28,7 @@ acl_smtp_expn = yyy
 acl_smtp_mail = yyy
 acl_smtp_rcpt = 
 acl_smtp_vrfy = 
 acl_smtp_mail = yyy
 acl_smtp_rcpt = 
 acl_smtp_vrfy = 

-accept_8bitmime
+no_accept_8bitmime

 acl_not_smtp = 
 acl_smtp_auth = xxx
 acl_smtp_connect = xxx
 acl_not_smtp = 
 acl_smtp_auth = xxx
 acl_smtp_connect = xxx


@@ -69,7 +69,9 @@ check_string =
 command = /x/y
 environment = 
 escape_string = 
 command = /x/y
 environment = 
 escape_string = 

+no_force_command

 no_freeze_exec_fail
 no_freeze_exec_fail

+no_freeze_signal

 no_ignore_status
 no_log_defer_output
 no_log_fail_output
 no_ignore_status
 no_log_defer_output
 no_log_fail_output


@@ -78,6 +80,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
 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
 no_pipe_as_creator
 no_restrict_to_path
 no_return_fail_output


@@ -120,7 +123,9 @@ check_string =
 command = /x/y
 environment = 
 escape_string = 
 command = /x/y
 environment = 
 escape_string = 

+no_force_command

 no_freeze_exec_fail
 no_freeze_exec_fail

+no_freeze_signal

 no_ignore_status
 no_log_defer_output
 no_log_fail_output
 no_ignore_status
 no_log_defer_output
 no_log_fail_output


@@ -129,6 +134,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
 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
 no_pipe_as_creator
 no_restrict_to_path
 no_return_fail_output