Testsuite: tidying

[exim.git] / test / confs / 0001

diff --git a/test/confs/0001 b/test/confs/0001
index 1eb0e884c558272023483a5d05c255660f3e7092..09c47895b618c1e9904cc9686b0803e0e12f5ef7 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -54,6 +54,7 @@ daemon_smtp_port =
 daemon_smtp_ports =
 daemon_startup_retries = 3
 daemon_startup_sleep = 8s
 daemon_smtp_ports =
 daemon_startup_retries = 3
 daemon_startup_sleep = 8s

+debug_store

 delay_warning = 1d
 delay_warning_condition = ${if match{$h_precedence:}{(?i)bulk|list}{no}{yes}}
 deliver_drop_privilege
 delay_warning = 1d
 delay_warning_condition = ${if match{$h_precedence:}{(?i)bulk|list}{no}{yes}}
 deliver_drop_privilege


@@ -94,7 +95,6 @@ no_local_from_check
 local_from_prefix = *-
 local_from_suffix = =*
 local_interfaces =
 local_from_prefix = *-
 local_from_suffix = =*
 local_interfaces =

-local_scan_timeout = 10s

 local_sender_retain
 localhost_number = "3 "
 log_selector =  \
 local_sender_retain
 localhost_number = "3 "
 log_selector =  \


@@ -131,6 +131,7 @@ no_message_logs
 message_size_limit = 500K
 mua_wrapper
 never_users = root:0
 message_size_limit = 500K
 mua_wrapper
 never_users = root:0

+panic_coredump

 percent_hack_domains =
 pipelining_advertise_hosts = *.b.c
 pid_file_path = /some/thing
 percent_hack_domains =
 pipelining_advertise_hosts = *.b.c
 pid_file_path = /some/thing


@@ -193,6 +194,7 @@ no_strip_excess_angle_brackets
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp

+no_syslog_pid

 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter
 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter


@@ -207,7 +209,7 @@ timeout_frozen_after = 7d
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42

-trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
+trusted_users = ${readfile{DIR/aux-var/TESTNUM.trusted}{:}}

 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *
 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *