Testsuite: avoid using STARTTLS in a non-TLS testcase

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

diff --git a/test/confs/3600 b/test/confs/3600
index c70fa19d7e0a89c183ba4ef09e63f7d831560d12..e955676372abf663245ee2fa85b209c93b7a79b5 100644 (file)
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-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

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

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


@@ -39,6 +34,7 @@ spabad:
   client_password = ${if eq{1}{0}{xxx}fail}
   client_username = username
   server_password = ok@test.ex
   client_password = ${if eq{1}{0}{xxx}fail}
   client_username = username
   server_password = ok@test.ex

+  server_set_id = $auth1

 
 spa:
   driver = spa
 
 spa:
   driver = spa


@@ -47,6 +43,7 @@ spa:
   client_username = username
   server_debug_print = +++SPA \$auth1="$auth1"
   server_password = ok@test.ex
   client_username = username
   server_debug_print = +++SPA \$auth1="$auth1"
   server_password = ok@test.ex

+  server_set_id = $auth1

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -66,6 +63,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   allow_localhost
   hosts_require_auth = *
 
   allow_localhost
   hosts_require_auth = *