DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 3414

diff --git a/test/confs/3414 b/test/confs/3414
index 9013868998c1c2fcd7e0b8e63ca5464260f6247f..25205a4c1eda1b3d63eae0218033a5fff75957bf 100644 (file)
--- a/test/confs/3414
+++ b/test/confs/3414
@@ -1,21 +1,26 @@
 # Exim test configuration 3414
 
 ACL=
 # Exim test configuration 3414
 
 ACL=

-S=
+OPT=

 
 exim_path = EXIM_PATH
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+chunking_advertise_hosts =
+tls_advertise_hosts =
+.ifdef _EXP_LIMITS
+limits_advertise_hosts = !*
+.endif

 
 # ----- Main settings -----
 
 acl_smtp_mail = mail
 
 # ----- Main settings -----
 
 acl_smtp_mail = mail

-S acl_smtp_mailauth=ACL
+OPT acl_smtp_mailauth=ACL

 
 
 # ----- ACLs -----
 
 
 # ----- ACLs -----