Merge from master into 4.next

[exim.git] / test / confs / 0227

diff --git a/test/confs/0227 b/test/confs/0227
index 063ced4819e41aa274752ad6e2a0644eb9d823e3..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 -----
 
@@ -31,6 +26,8 @@ check_recipient:
          !verify   = recipient/callout=no_cache
   deny    hosts    = V4NET.0.0.5
          !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
@@ -82,7 +79,6 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
 
 lmtp:
   driver = smtp