Merge branch '4.next'

[exim.git] / test / stdout / 0001

diff --git a/test/stdout/0001 b/test/stdout/0001
index d9ce2f07b182a8845b8d724e77b316526c133ada..4cb2c56333777b792c83d1cb73e35a2149549481 100644 (file)
--- a/test/stdout/0001
+++ b/test/stdout/0001
@@ -1,8 +1,12 @@
 no_accept_8bitmime
 bounce_message_file = 
 callout_domain_negative_expire = 1h
 no_accept_8bitmime
 bounce_message_file = 
 callout_domain_negative_expire = 1h

+no_commandline_checks_require_admin

 daemon_smtp_ports = 
 daemon_smtp_ports = 

+debug_store
+dns_cname_loops = 1

 envelope_to_remove
 envelope_to_remove

+exim_version = x.yz

 finduser_retries = 0
 gecos_name = CALLER_NAME
 headers_charset = UTF-8
 finduser_retries = 0
 gecos_name = CALLER_NAME
 headers_charset = UTF-8


@@ -11,12 +15,16 @@ keep_malformed = 4d
 no_local_from_check
 max_username_length = 8
 never_users = root:root
 no_local_from_check
 max_username_length = 8
 never_users = root:root

+notifier_socket = $spool_directory/exim_daemon_notify

 percent_hack_domains = 
 qualify_domain = some.dom.ain
 retry_interval_max = 1d
 receive_timeout = 0s
 sender_unqualified_hosts = localhost:some.host.name
 percent_hack_domains = 
 qualify_domain = some.dom.ain
 retry_interval_max = 1d
 receive_timeout = 0s
 sender_unqualified_hosts = localhost:some.host.name

+smtp_backlog_monitor = 0
+no_spool_wireformat

 no_tcp_nodelay
 no_tcp_nodelay

-trusted_users = 1234:5678
+trusted_users = CALLER:5678

 unknown_login = unknownlogin
 warn_message_file = /home/exim/test/warnmsg_file
 unknown_login = unknownlogin
 warn_message_file = /home/exim/test/warnmsg_file

+no_syslog_pid