LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0092

diff --git a/test/confs/0092 b/test/confs/0092
index c58115939caeab4dcb694d64242683a210bd560c..cdcf52330f8e7c6a84ec46f5548e3fde3408f792 100644 (file)
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -1,3 +1,5 @@
+# Exim test configuration 0092
+

 acl_smtp_rcpt = check_recipient
 acl_smtp_data = check_message
 
 acl_smtp_rcpt = check_recipient
 acl_smtp_data = check_message
 


@@ -5,21 +7,18 @@ domainlist local_domains = test.ex : *.test.ex
 
 domainlist relay_domains = test.ex
 
 
 domainlist relay_domains = test.ex
 

-# Exim test configuration 0092
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 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

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

-smtp_receive_timeout = 2s
+OPT = 2s
+
+.ifndef COM
+smtp_receive_timeout = OPT

 receive_timeout = 2s
 receive_timeout = 2s

+.endif

 
 
 begin acl
 
 
 begin acl