SPF: additional variable $spf_result_guessed; tweak authresults string indicating...

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

diff --git a/test/confs/5840 b/test/confs/5840
index 01c114252a5c52d45daa6196d7d146d095a2c1d9..754945d6ea87c83a13702b960b262bb7b6b7da7f 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -1,5 +1,5 @@
 # Exim test configuration 5840
 # Exim test configuration 5840

-# DANE
+# DANE/OpenSSL

 
 SERVER=
 
 
 SERVER=
 


@@ -10,7 +10,7 @@ primary_hostname = myhost.test.ex
 # ----- Main settings -----
 
 .ifndef OPT
 # ----- Main settings -----
 
 .ifndef OPT

-acl_smtp_rcpt = accept
+acl_smtp_rcpt = accept logwrite = "rcpt ACL"

 .else
 acl_smtp_rcpt = accept verify = recipient/callout
 .endif
 .else
 acl_smtp_rcpt = accept verify = recipient/callout
 .endif


@@ -22,20 +22,28 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 # Set certificate only if server
 tls_advertise_hosts = *
 
 # Set certificate only if server

-CDIR1 = DIR/aux-fixed
+CDIR1 = DIR/aux-fixed/exim-ca/example.net/server1.example.net

 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 

+.ifdef CERT
+tls_certificate = CERT
+.else

 tls_certificate = ${if eq {SERVER}{server} \
 tls_certificate = ${if eq {SERVER}{server} \

-       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
+       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \

                {CDIR2/fullchain.pem}\
                {CDIR2/fullchain.pem}\

-               {CDIR1/cert1}}}\
+               {CDIR1/fullchain.pem}}}\

        fail}
        fail}

+.endif

 
 

+.ifdef ALLOW
+tls_privatekey = ALLOW
+.else

 tls_privatekey = ${if eq {SERVER}{server} \
 tls_privatekey = ${if eq {SERVER}{server} \

-       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
+       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \

                {CDIR2/server1.example.com.unlocked.key}\
                {CDIR2/server1.example.com.unlocked.key}\

-               {CDIR1/cert1}}}\
+               {CDIR1/server1.example.net.unlocked.key}}}\

        fail}
        fail}

+.endif

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


@@ -61,7 +69,7 @@ begin transports
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

-  port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}}
+  port = PORT_D

 
   hosts_try_dane =     *
   hosts_require_dane = HOSTIPV4
 
   hosts_try_dane =     *
   hosts_require_dane = HOSTIPV4