Hurd: errno really uses more than a short-sized value. Bug 2476

[exim.git] / test / confs / 2013

diff --git a/test/confs/2013 b/test/confs/2013
index 331dd09ef3f50e2bea92900c3e462c9c017785b2..4c9fcd3e8ca221099529f7813afd79e75e44cc21 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -1,20 +1,17 @@
 # Exim test configuration 2013
 
 SERVER =
 # Exim test configuration 2013
 
 SERVER =

+PEX = :
+
+.include DIR/aux-var/tls_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

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

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 

-log_selector = +tls_peerdn+smtp_connection+incoming_port
+log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients

 
 queue_only
 queue_run_in_order
 
 queue_only
 queue_run_in_order


@@ -33,6 +30,15 @@ tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 begin routers
 
 
 begin routers
 

+.ifdef REQUIRE
+cl_override:
+  driver = manualroute
+  route_data = HOSTIPV4
+  retry_use_local_part
+  transport = send_to_server
+  self = send
+.endif
+

 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}
 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}


@@ -58,7 +64,10 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

+  hosts_override

   hosts = 127.0.0.1
   hosts = 127.0.0.1

+  hosts_noproxy_tls = PEX

   port = PORT_D
   port = PORT_D

+  tls_try_verify_hosts = :

 
 # End
 
 # End