Unbreak build with dmarc, pt. 2

[exim.git] / test / confs / 4560

diff --git a/test/confs/4560 b/test/confs/4560
index c80148b3e10ea876d3a9e90c9cbe649a669f8d46..8cffd65cfb505efd320914164b23ee04562165db 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -1,6 +1,8 @@
 # Exim test configuration 4560
 
 SERVER=
 # Exim test configuration 4560
 
 SERVER=

+VALUE=
+INSERT=

 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 


@@ -13,12 +15,29 @@ acl_smtp_data = check_data
 
 log_selector = +received_recipients +dkim_verbose
 queue_only
 
 log_selector = +received_recipients +dkim_verbose
 queue_only

+queue_run_in_order

 
 # ----- ACL -----
 begin acl
 
 check_data:
 
 # ----- ACL -----
 begin acl
 
 check_data:

-  warn !verify =       arc
+  warn !verify =       arc VALUE
+       INSERT
+
+  warn logwrite =      arc_state:      <$arc_state>
+       logwrite =      domains:        <$arc_domains>
+       logwrite =      arc_oldest_pass <$arc_oldest_pass>
+       logwrite =      reason:         <$arc_state_reason>
+       logwrite =      lh_A-R:         <$lh_Authentication-Results:>
+       logwrite =      lh-ams:         <$lh_ARC-Authentication-Results:>
+#      logwrite =      oldest-p-ams:   <${listextract {$arc_oldest_pass} {$lh_ARC-Authentication-Results:}}>
+       logwrite =      oldest-p-ams:   <${reduce {$lh_ARC-Authentication-Results:} \
+                                               {} \
+                                               {${if = {$arc_oldest_pass} \
+                                                       {${extract {i}{${extract {1}{;}{$item}}}}} \
+                                                       {$item} {$value}}} \
+                                       }>
+

 .ifdef OPTION
   accept
 .else
 .ifdef OPTION
   accept
 .else


@@ -60,6 +79,7 @@ begin transports
 tfile:
   driver =     appendfile
   file =       DIR/test-mail/$local_part
 tfile:
   driver =     appendfile
   file =       DIR/test-mail/$local_part

+  create_file =        DIR/test-mail

   user =       CALLER
 
 tsmtp:
   user =       CALLER
 
 tsmtp:


@@ -68,8 +88,12 @@ tsmtp:
   port =       PORT_D
   allow_localhost
 .ifndef OPTION
   port =       PORT_D
   allow_localhost
 .ifndef OPTION

+.ifdef BAD
+  arc_sign =   $primary_hostname : sel : MISSING_KEY
+.else

   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif
   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif

+.endif

 
 tmlist:
   driver =     smtp
 
 tmlist:
   driver =     smtp