GnuTLS: fix hanging callout connections

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

diff --git a/test/confs/0571 b/test/confs/0571
index 64383cdd816e040f715ce0b9a4c1b19aa705512f..d7c19f14cad161c0d6a057b09868eb6dea63c767 100644 (file)
--- a/test/confs/0571
+++ b/test/confs/0571
@@ -2,14 +2,9 @@
 
 LOG_SELECTOR=
 
 
 LOG_SELECTOR=
 

-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
-tls_advertise_hosts =

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


@@ -32,8 +27,8 @@ acl_not_smtp =  ${if def:sender_address \
 begin acl
 
 acl_29_29_29:
 begin acl
 
 acl_29_29_29:

-  deny    dnslists = test.ex/$sender_address_domain
-  accept
+  deny    dnslists =   test.ex/$sender_address_domain
+  accept  logwrite =   authresults: ${authresults {$primary_hostname}}

 
 acl_29_29_0:
   deny    dnslists = test.ex
 
 acl_29_29_0:
   deny    dnslists = test.ex


@@ -45,7 +40,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 t2:
   user = CALLER
 
 t2: