Remove word "rejected" from ACL-discard log lines. Bug 1632

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

diff --git a/test/confs/0023 b/test/confs/0023
index 62e444a5d6104ab845d4a817718daadf0bc5d273..43f140d659dc84e634ce5e777c1d17262aab0ba4 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -5,7 +5,6 @@ LOG_SELECTOR=
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -51,6 +50,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


@@ -98,6 +98,10 @@ acl_9_9_9:
 acl_V4NET_0_0:
   require verify = reverse_host_lookup
   accept
 acl_V4NET_0_0:
   require verify = reverse_host_lookup
   accept

+acl_V4NET_99_99:
+  accept  local_parts = defer_ok
+         verify = reverse_host_lookup/defer_ok
+  accept  verify = reverse_host_lookup

 
 acl_V4NET_11_12:
   deny    message = host in DNS list $dnslist_domain: $dnslist_text
 
 acl_V4NET_11_12:
   deny    message = host in DNS list $dnslist_domain: $dnslist_text


@@ -155,6 +159,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 +208,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 +224,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 -----