DMARC: add variables for spf/dkim alignment results. Bug 3119

[exim.git] / test / confs / 4163

diff --git a/test/confs/4163 b/test/confs/4163
index 3b4f6df79676cb9ae2c2dbfc6253e67cef60d0c1..94d1c9c4c2af0915b8df4b8dd06f76273b1dbb66 100644 (file)
--- a/test/confs/4163
+++ b/test/confs/4163
@@ -1,58 +1,41 @@
 # Exim test configuration 4163
 
-SERVER=
+FUSER=
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
-log_selector = +received_recipients +smtp_connection +millisec
-
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept
+system_filter = DIR/aux-fixed/TESTNUM.F
+FUSER
+
 
 # ----- Routers -----
 
 begin routers
 
-discard:
-  driver =             redirect
-  domains =            !test.ex
-  data =               :blackhole:
-
-client:
-  driver =             redirect
-  file =               DIR/aux-fixed/TESTNUM.sieve
+r1:
+  driver = redirect
   allow_filter
-  user =               CALLER
-  file_transport =     local_file
-  errors_to =          ""
-
-# ----- Transports -----
+  file = DIR/aux-var/TESTNUM.f
+  user = CALLER
 
-begin transports
-
-local_file:
-  driver =             appendfile
-  file =               DIR/test-mail/${if eq{$address_file}{inbox} {$local_part} {$address_file}}
-  create_file =                DIR/test-mail
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-send_to_server:
-  driver = smtp
-  allow_localhost
-  hosts = 127.0.0.1
-  port = PORT_D
+r2:
+  driver = accept
+  transport = t1
 
-# ----- Retry -----
 
+# ----- Transports -----
 
-begin retry
+begin transports
 
-* * F,5d,10s
+t1:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
+  user = CALLER
 
 
 # End