Debug: indentation

[exim.git] / test / confs / 3465

diff --git a/test/confs/3465 b/test/confs/3465
index adadeb0591f66b0a99cecca66147f5b435dfa811..2ff6a5172552707b7e5b35a32c2535c6ed14245c 100644 (file)
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -2,14 +2,9 @@
 
 HOSTS_AVOID_TLS=
 
 
 HOSTS_AVOID_TLS=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -23,8 +18,6 @@ queue_only = true
 
 tls_advertise_hosts = *
 tls_certificate = DIR/aux-fixed/cert1
 
 tls_advertise_hosts = *
 tls_certificate = DIR/aux-fixed/cert1

-tls_privatekey = DIR/aux-fixed/cert1
-

 
 # ----- Authenticators -----
 
 
 # ----- Authenticators -----
 


@@ -36,7 +29,7 @@ plain:
   server_condition = "\
     ${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}"
   server_set_id = $2
   server_condition = "\
     ${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}"
   server_set_id = $2

-  client_condition = ${if !eq {$tls_cipher}{}}
+  client_condition = ${if !eq {$tls_out_cipher}{}}

   client_send = ^userx^secret1
 
 login:
   client_send = ^userx^secret1
 
 login:


@@ -66,9 +59,16 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D

-  hosts_avoid_tls = HOSTS_AVOID_TLS
-  hosts_require_auth = *

   allow_localhost
   allow_localhost

+  hosts_try_fastopen = :
+  hosts_avoid_tls      = HOSTS_AVOID_TLS
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :
+  hosts_require_auth = *
+
+  # These can be made visible by adding "-d-all+deliver+transport+tls" to the script 1st queuerun
+  headers_add = X-tls-cipher: <$tls_cipher>
+  headers_add = X-tls-out-cipher: <$tls_out_cipher>

 
 
 # End
 
 
 # End