GnuTLS: fix hanging callout connections

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

diff --git a/test/confs/0001 b/test/confs/0001
index b0f8f61e35097e456df33d9b90c1258500967571..c8ad6f43fecfab27f4a0257ac8ac0751291113ab 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -54,6 +54,7 @@ daemon_smtp_port =
 daemon_smtp_ports =
 daemon_startup_retries = 3
 daemon_startup_sleep = 8s
 daemon_smtp_ports =
 daemon_startup_retries = 3
 daemon_startup_sleep = 8s

+debug_store

 delay_warning = 1d
 delay_warning_condition = ${if match{$h_precedence:}{(?i)bulk|list}{no}{yes}}
 deliver_drop_privilege
 delay_warning = 1d
 delay_warning_condition = ${if match{$h_precedence:}{(?i)bulk|list}{no}{yes}}
 deliver_drop_privilege


@@ -94,7 +95,6 @@ no_local_from_check
 local_from_prefix = *-
 local_from_suffix = =*
 local_interfaces =
 local_from_prefix = *-
 local_from_suffix = =*
 local_interfaces =

-local_scan_timeout = 10s

 local_sender_retain
 localhost_number = "3 "
 log_selector =  \
 local_sender_retain
 localhost_number = "3 "
 log_selector =  \


@@ -208,7 +208,7 @@ timeout_frozen_after = 7d
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42

-trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
+trusted_users = ${readfile{DIR/aux-var/TESTNUM.trusted}{:}}

 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *
 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *


@@ -517,7 +517,7 @@ appendfile:
   directory_mode = 0700
   envelope_to_add
   escape_string = xyz
   directory_mode = 0700
   envelope_to_add
   escape_string = xyz

-  file = /home/$local_part/inbox
+  file = /home/${bless:$local_part}/inbox

   file_format = "From : appendfile"
   no_file_must_exist
   group = MAILGROUP
   file_format = "From : appendfile"
   no_file_must_exist
   group = MAILGROUP