Testsuite: Fix IPv4 address detection.

[users/jgh/exim.git] / test / confs / 0001

diff --git a/test/confs/0001 b/test/confs/0001
index 7f7fb4a1ead342fe06af3afdf8e805bb3ea84f4e..8d55b2989724e57eff75cb17531b4ba85d38f654 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -5,15 +5,15 @@
 # mess up the creation of the spool directory etc.
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 
 
-accept_8bitmime
+no_accept_8bitmime
 acl_not_smtp = check_local_message
 acl_smtp_auth = check_auth
 acl_smtp_connect = check_connect
@@ -39,6 +39,7 @@ bounce_return_body = false
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K
+bounce_return_linesize_limit = 997
 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h
@@ -147,7 +148,7 @@ no_queue_only_override
 queue_only_file = /var/spool/exim/queue_only
 queue_only_load = 8.2
 no_queue_run_in_order
-queue_run_max = 5
+queue_run_max = ${if = {1}{1} {5}{10}}
 queue_smtp_domains = x.y.z
 receive_timeout = 0s
 received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}}
@@ -158,7 +159,7 @@ no_recipients_max_reject
 remote_max_parallel = 1
 remote_sort_domains =
 retry_data_expire = 24h
-retry_interval_max = 1d
+retry_interval_max = 3d
 return_path_remove
 rfc1413_hosts =
 sender_unqualified_hosts = localhost:some.host.name
@@ -204,6 +205,7 @@ system_filter_user = 99
 tcp_nodelay = false
 timeout_frozen_after = 7d
 timezone = EDT
+tls_advertise_hosts =
 trusted_groups = 42
 trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
 unknown_login = unknownlogin
@@ -528,7 +530,7 @@ appendfile:
   lockfile_timeout = 30m
   mailbox_size = 1000
   mailbox_filecount = 9999
-  message_size_limit = 1M
+  message_size_limit = 1G
   mode = 0600
   mode_fail_narrower
   no_notify_comsat
@@ -574,6 +576,7 @@ appendfile4:
 smtp:
   driver = smtp
   authenticated_sender = abcde
+  authenticated_sender_force = true
   no_allow_localhost
   command_timeout = 5m
   connect_timeout = 0s