Merge branch 'master' into 4.next

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

diff --git a/test/confs/0001 b/test/confs/0001
index 7f7fb4a1ead342fe06af3afdf8e805bb3ea84f4e..5350ba463f4cdfd260f9b97b164cc4cb1f64af00 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -6,14 +6,13 @@
 
 exim_path = EXIM_PATH
 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 +38,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
@@ -158,7 +158,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 +204,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
@@ -574,6 +575,7 @@ appendfile4:
 smtp:
   driver = smtp
   authenticated_sender = abcde
+  authenticated_sender_force = true
   no_allow_localhost
   command_timeout = 5m
   connect_timeout = 0s