Merge branch '4.next'

[users/heiko/exim.git] / test / confs / 3416

diff --git a/test/confs/3416 b/test/confs/3416
index f76652f95aaae167046a64d304357e5d9357385e..eebb132f36dd2b9cccac04e05422bf3e4d7baf34 100644 (file)
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -1,15 +1,9 @@
 # Exim test configuration 3416
 # Recipient callout with AUTH
 
 # Exim test configuration 3416
 # Recipient callout with AUTH
 

-exim_path = EXIM_PATH
-keep_environment =
-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 -----
 


@@ -57,6 +51,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_try_auth = *
 
   allow_localhost
   hosts_try_auth = *
 


@@ -64,6 +59,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   hosts_try_auth = *
   authenticated_sender= brian
   allow_localhost
   hosts_try_auth = *
   authenticated_sender= brian