ibase lookup: further compile fixes

[exim.git] / test / confs / 2026

diff --git a/test/confs/2026 b/test/confs/2026
index 4185e0b7978d450c437a934f6996f36266918eb4..270a0682c8a64ab0026fcacffeba645d5b6ce1a4 100644 (file)
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -1,19 +1,28 @@
 # Exim test configuration 2026
 
 exim_path = EXIM_PATH
 # Exim test configuration 2026
 
 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
 spool_directory = DIR/spool

+.ifdef SERVER

 log_file_path = DIR/spool/log/%slog
 log_file_path = DIR/spool/log/%slog

+.else
+log_file_path = DIR/spool/log/%D-%slog
+.endif

 gecos_pattern = ""
 gecos_name = CALLER_NAME
 
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 

+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+

 # ----- Main settings -----
 
 acl_smtp_rcpt = check_rcpt
 log_selector = +tls_peerdn
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = check_rcpt
 log_selector = +tls_peerdn
 

+

 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 tls_advertise_hosts = HOSTIPV4
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1


@@ -25,12 +34,12 @@ begin acl
 
 check_rcpt:
   accept  local_parts = userx
 
 check_rcpt:
   accept  local_parts = userx

+          control = queue_only

 
   defer   local_parts = usery
           hosts       = 127.0.0.1
 
 
   defer   local_parts = usery
           hosts       = 127.0.0.1
 

-  accept
-
+  accept  control = queue_only

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -54,6 +63,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
 
 t2:
   allow_localhost
 
 t2: