diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0230 | 2 | ||||
| -rw-r--r-- | test/confs/0290 | 4 | ||||
| -rw-r--r-- | test/confs/0465 | 4 | ||||
| -rw-r--r-- | test/confs/0551 | 4 | ||||
| -rw-r--r-- | test/confs/0557 | 8 | ||||
| -rw-r--r-- | test/confs/0900 | 4 | ||||
| -rw-r--r-- | test/confs/3414 | 4 | ||||
| -rw-r--r-- | test/confs/5600 | 2 | ||||
| -rw-r--r-- | test/confs/5601 | 2 | ||||
| -rw-r--r-- | test/confs/5740 | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/test/confs/0230 b/test/confs/0230 index d9cecf3d4..c26b45758 100644 --- a/test/confs/0230 +++ b/test/confs/0230 @@ -32,7 +32,7 @@ check_recipient: begin routers -.ifdef RT +.ifdef OPT to_server: driver = manualroute transport = remote diff --git a/test/confs/0290 b/test/confs/0290 index e7c501c91..5ccb8451f 100644 --- a/test/confs/0290 +++ b/test/confs/0290 @@ -3,7 +3,7 @@ FOOBAR= FOO=inc1 BAR=.include "DIR/aux-fixed/TESTNUM.inc2" -RT = receive_timeout = 1s +OPT = receive_timeout = 1s INC= C1=# @@ -18,7 +18,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- FOOBAR .include DIR/aux-fixed/TESTNUM.FOO -RT +OPT INC remote_sort_domains = a:b:c diff --git a/test/confs/0465 b/test/confs/0465 index 45ec3314e..9fc5579df 100644 --- a/test/confs/0465 +++ b/test/confs/0465 @@ -1,6 +1,6 @@ # Exim test configuration 0465 -STD= +OPT= .include DIR/aux-var/std_conf_prefix @@ -12,7 +12,7 @@ acl_smtp_rcpt = accept acl_smtp_data = check_data queue_only trusted_users = CALLER -STD +OPT begin acl diff --git a/test/confs/0551 b/test/confs/0551 index b37b74cf7..1b4465bdd 100644 --- a/test/confs/0551 +++ b/test/confs/0551 @@ -1,6 +1,6 @@ # Exim test configuration 0551 -LS=+pid +LOG_SELECTOR=+pid .include DIR/aux-var/std_conf_prefix @@ -8,7 +8,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -log_selector = LS +log_selector = LOG_SELECTOR # ----- Routers ----- diff --git a/test/confs/0557 b/test/confs/0557 index 5c944e9cd..9b7dec2e6 100644 --- a/test/confs/0557 +++ b/test/confs/0557 @@ -1,7 +1,7 @@ # Exim test configuration 0557 -X= -Y= +FAKE= +OPT= HOSTS= HAI= @@ -19,8 +19,8 @@ begin routers r1: driver = manualroute route_list = * HOSTS -X host_find_failed = ignore -Y host_all_ignored = HAI +FAKE host_find_failed = ignore +OPT host_all_ignored = HAI no_more self = send transport = t1 diff --git a/test/confs/0900 b/test/confs/0900 index 2eaf01ee3..21fbf0901 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -1,6 +1,6 @@ # Exim test configuration 0900 SERVER= -Y= +SRV= LIST= ALLOW= @@ -12,7 +12,7 @@ log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME chunking_advertise_hosts = * -tls_advertise_hosts = ${if eq {Y}{tls} {*}} +tls_advertise_hosts = ${if eq {SRV}{tls} {*}} # ----- Main settings ----- diff --git a/test/confs/3414 b/test/confs/3414 index 64c3cf48a..5d0f93c46 100644 --- a/test/confs/3414 +++ b/test/confs/3414 @@ -1,7 +1,7 @@ # Exim test configuration 3414 ACL= -S= +OPT= exim_path = EXIM_PATH keep_environment = @@ -17,7 +17,7 @@ tls_advertise_hosts = # ----- Main settings ----- acl_smtp_mail = mail -S acl_smtp_mailauth=ACL +OPT acl_smtp_mailauth=ACL # ----- ACLs ----- diff --git a/test/confs/5600 b/test/confs/5600 index a15936d83..b65a2797e 100644 --- a/test/confs/5600 +++ b/test/confs/5600 @@ -27,7 +27,7 @@ tls_verify_hosts = HOSTIPV4 tls_try_verify_hosts = * tls_verify_certificates = DIR/aux-fixed/cert2 tls_crl = CRL -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ diff --git a/test/confs/5601 b/test/confs/5601 index 788f509a9..3309870a3 100644 --- a/test/confs/5601 +++ b/test/confs/5601 @@ -39,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\ {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\ fail} -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ diff --git a/test/confs/5740 b/test/confs/5740 index 2f0fc25c5..ccc907c82 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -39,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\ {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\ fail} -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ |