Fix log line corruption for DKIM status

[exim.git] / test / confs / 0023

diff --git a/test/confs/0023 b/test/confs/0023
index be99eb00fa9b5d8841cd34a2be4203ed0904ccef..2481976ce09531ea3c38431ef8340392b09c3224 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -2,17 +2,14 @@
 
 LOG_SELECTOR=
 
 
 LOG_SELECTOR=
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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

+disable_ipv6 = true
+

 addresslist ok_senders = ok@ok.ok
 
 domainlist local_domains = test.ex : *.test.ex
 addresslist ok_senders = ok@ok.ok
 
 domainlist local_domains = test.ex : *.test.ex


@@ -51,6 +48,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 +96,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 +157,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 +206,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: