Merge from master into 4.next

[exim.git] / test / confs / 0227

diff --git a/test/confs/0227 b/test/confs/0227
index 17f49eb76fe85cd14e4f86d7a4f946b68dbcfbc9..ed988ac85d81a6e15301312a4f2271d02c640b60 100644 (file)
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -1,13 +1,8 @@
 # Exim test configuration 0227
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
@@ -28,11 +23,11 @@ check_recipient:
   deny    hosts    = V4NET.0.0.1
          !verify   = sender/callout=no_cache
   deny    hosts    = V4NET.0.0.3
-          log_message = ($recipient_verify_failure)
          !verify   = recipient/callout=no_cache
   deny    hosts    = V4NET.0.0.5
-          log_message = ($sender_verify_failure)
          !verify   = sender/callout=no_cache/check_postmaster
+  deny    hosts    = V4NET.0.0.6
+         !verify   = sender/callout=no_cache
   require verify   = sender
   accept  domains  = +local_domains
   deny    message  = relay not permitted