X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/93c931f83dfa0c448fbb4be09afe1d9fc753fe18..d901e231acd1917d24b688cbd7823efc2bed45c4:/test/confs/4560?ds=sidebyside

diff --git a/test/confs/4560 b/test/confs/4560
index c986d5f5c..8c5864b9a 100644
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -15,6 +15,7 @@ acl_smtp_data = check_data
 
 log_selector = +received_recipients +dkim_verbose
 queue_only
+queue_run_in_order
 
 # ----- ACL -----
 begin acl
@@ -23,9 +24,19 @@ check_data:
   warn	!verify =	arc VALUE
 	INSERT
 
-  warn	logwrite =	arc_state: <$arc_state>
-	condition =	${if def:arc_state_reason}
-	logwrite =	reason:    <$arc_state_reason>
+  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
@@ -67,7 +78,7 @@ begin transports
 
 tfile:
   driver =	appendfile
-  file =	DIR/test-mail/$local_part
+  file =	DIR/test-mail/${bless:$local_part}
   user =	CALLER
 
 tsmtp:
@@ -76,8 +87,12 @@ tsmtp:
   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
+.endif
 
 tmlist:
   driver =	smtp