Fix handling of $tls_cipher et.al. in (non-verify) transport. Bug 1455

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

diff --git a/test/confs/0023 b/test/confs/0023
index 62e444a5d6104ab845d4a817718daadf0bc5d273..4f79a87b57cae9a6d02da5456a1437b1c0dd70e3 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -51,6 +51,7 @@ acl_1_2_3:
 
   deny    message = domain explicitly denied
           log_message = DOMAIN EXPLICITLY DENIED
 
   deny    message = domain explicitly denied
           log_message = DOMAIN EXPLICITLY DENIED

+          continue = this value is not used

           domains = deny.test.ex
 
   accept  domains = +local_domains
           domains = deny.test.ex
 
   accept  domains = +local_domains


@@ -155,6 +156,7 @@ acl_29_29_29:
 acl_30_30_30:
   deny    message  = domain=$dnslist_domain\n\
                      value=$dnslist_value\n\
 acl_30_30_30:
   deny    message  = domain=$dnslist_domain\n\
                      value=$dnslist_value\n\

+                     matched=$dnslist_matched\n\

                      text="$dnslist_text"
           dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
   accept
                      text="$dnslist_text"
           dnslists = test.ex=V4NET.0.0.1,127.0.0.2/$sender_address_domain
   accept


@@ -203,7 +205,7 @@ acl_56_56_56:
   accept
 
 acl_56_56_57:
   accept
 
 acl_56_56_57:

-  accept  message = denied by condition
+  accept  message = accepted by condition

           condition = ${substr_5:$local_part}
 
 acl_56_56_58:
           condition = ${substr_5:$local_part}
 
 acl_56_56_58:


@@ -219,6 +221,9 @@ acl_56_56_59:
                     Original was >$acl_verify_message<
           verify  = recipient
 
                     Original was >$acl_verify_message<
           verify  = recipient
 

+acl_60_60_60:
+  accept !acl = DIR/aux-fixed/0023.acl2
+

 
 # ----- Transports -----
 
 
 # ----- Transports -----