DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4560

diff --git a/test/confs/4560 b/test/confs/4560
index 8c5864b9a5f48a38017d4d80bead453e72ff637b..d6627bae56d5173e43ee8e6afbe2e1dd8e3f93ab 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -29,9 +29,9 @@ check_data:
        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:} \
+       logwrite =      lh-AAR:         <$lh_ARC-Authentication-Results:>
+#      logwrite =      oldest-p-AAR:   <${listextract {$arc_oldest_pass} {$lh_ARC-Authentication-Results:}}>
+       logwrite =      oldest-p-AAR:   <${reduce {$lh_ARC-Authentication-Results:} \
                                                {} \
                                                {${if = {$arc_oldest_pass} \
                                                        {${extract {i}{${extract {1}{;}{$item}}}}} \
@@ -78,7 +78,8 @@ begin transports
 
 tfile:
   driver =     appendfile
-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
   user =       CALLER
 
 tsmtp: