GnuTLS: fix hanging callout connections

[users/jgh/exim.git] / test / confs / 0026

diff --git a/test/confs/0026 b/test/confs/0026
index db267d50264b20d0b17c564b7a30cb36141d2a24..cc0c51c9b1d61ac37a1038a210184f5ccefad958 100644 (file)
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,12 +1,8 @@
 # Exim test configuration 0026
 
 # Exim test configuration 0026
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

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

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

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


@@ -24,6 +20,7 @@ begin acl
 acl_data:
   deny     log_message = body contains trigger
            condition = ${if match{$message_body}{trigger}{yes}{no}}
 acl_data:
   deny     log_message = body contains trigger
            condition = ${if match{$message_body}{trigger}{yes}{no}}

+  warn    logwrite = \$h_from: '$h_from:'

   require  verify = header_syntax
   warn     message = X-warning: this is a test warning
   accept   senders = ! :
   require  verify = header_syntax
   warn     message = X-warning: this is a test warning
   accept   senders = ! :


@@ -57,7 +54,7 @@ dev_null:
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 # End
   user = CALLER
 
 # End