Merge branch 'master' into 4.next
[exim.git] / test / confs / 3414
index 3b410c104e9a1f3db132f18ae88895e6cb271d84..5d0f93c46bc98ecd644926dd88c6be3230451c3a 100644 (file)
@@ -1,20 +1,23 @@
 # Exim test configuration 3414
 
 ACL=
-S=
+OPT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+tls_advertise_hosts =
 
 # ----- Main settings -----
 
 acl_smtp_mail = mail
-S acl_smtp_mailauth=ACL
+OPT acl_smtp_mailauth=ACL
 
 
 # ----- ACLs -----