summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/aux-fixed/4690.tldfile1
-rw-r--r--test/confs/45606
-rw-r--r--test/confs/4690115
-rw-r--r--test/log/456092
-rw-r--r--test/log/45614
-rw-r--r--test/log/45628
-rw-r--r--test/log/45634
-rw-r--r--test/log/469057
-rw-r--r--test/mail/4560.a88
-rw-r--r--test/mail/4565.a8
-rw-r--r--test/mail/4690.a67
-rw-r--r--test/scripts/4500-DKIM/45002
-rw-r--r--test/scripts/4690-DMARC-ARC/469045
-rw-r--r--test/scripts/4690-DMARC-ARC/REQUIRES3
-rw-r--r--test/stdout/46504
-rw-r--r--test/stdout/469086
16 files changed, 484 insertions, 106 deletions
diff --git a/test/aux-fixed/4690.tldfile b/test/aux-fixed/4690.tldfile
new file mode 100644
index 000000000..a9eb3bbf4
--- /dev/null
+++ b/test/aux-fixed/4690.tldfile
@@ -0,0 +1 @@
+ac
diff --git a/test/confs/4560 b/test/confs/4560
index 8cffd65cf..d6627bae5 100644
--- 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}}}}} \
diff --git a/test/confs/4690 b/test/confs/4690
new file mode 100644
index 000000000..ad4ac7279
--- /dev/null
+++ b/test/confs/4690
@@ -0,0 +1,115 @@
+# Exim test configuration 4690
+
+SERVER=
+
+exim_path = EXIM_PATH
+keep_environment =
+host_lookup_order = bydns
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts = *
+tls_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
+
+primary_hostname = test.ex
+
+# ----- Main settings -----
+
+dmarc_tld_file = DIR/aux-fixed/TESTNUM.tldfile
+dmarc_history_file = DIR/tmp/TESTNUM.hist.dmarc
+
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
+
+log_selector = +received_recipients +dkim_verbose
+queue_only
+queue_run_in_order
+
+# ----- ACL -----
+begin acl
+
+check_data:
+ warn !verify = arc
+
+ 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-AAR: <$lh_ARC-Authentication-Results:>
+ logwrite = oldest-p-AAR: <${reduce {$lh_ARC-Authentication-Results:} \
+ {} \
+ {${if = {$arc_oldest_pass} \
+ {${extract {i}{${extract {1}{;}{$item}}}}} \
+ {$item} {$value}}} \
+ }>
+
+ require spf = pass : !pass
+ dmarc_status = none : !none
+ logwrite = dmarc_status <$dmarc_status>
+ logwrite = dmarc_status_text <$dmarc_status_text>
+ logwrite = dmarc_used_domain <$dmarc_used_domain>
+ logwrite = dmarc_domain_policy <$dmarc_domain_policy>
+ set acl_m0 = ${authresults {$primary_hostname}}
+ logwrite = $acl_m0
+
+ accept add_header = :at_start:$acl_m0
+
+# ----- Routers -----
+
+begin routers
+
+d1:
+ driver = accept
+ local_parts = ^a
+ transport = tfile
+
+r2:
+ driver = redirect
+ local_parts = ^m
+ data = ${substr_1:$local_part}@$domain
+ redirect_router = mlist
+
+redir:
+ driver = redirect
+ data = ${substr_1:$local_part}@$domain
+ redirect_router = fwd
+
+fwd:
+ driver = accept
+ transport = tsmtp
+
+mlist:
+ driver = accept
+ transport = tmlist
+
+# ----- Transports -----
+
+begin transports
+
+tfile:
+ driver = appendfile
+ file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
+ user = CALLER
+
+tsmtp:
+ driver = smtp
+ hosts = 127.0.0.1
+ port = PORT_D
+ allow_localhost
+ arc_sign = $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
+
+tmlist:
+ driver = smtp
+ hosts = 127.0.0.1
+ port = PORT_D
+ allow_localhost
+ transport_filter = /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter
+ arc_sign = $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
+
+# End
diff --git a/test/log/4560 b/test/log/4560
index 40d3e5504..0f8c63aea 100644
--- a/test/log/4560
+++ b/test/log/4560
@@ -6,8 +6,8 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh_A-R: < test.ex; arc=none>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-ams: < i=1; test.ex; arc=none>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-ams: <i=1; test.ex; arc=none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-AAR: < i=1; test.ex; arc=none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; arc=none>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss ARC id=qwerty1234@disco-zombie.net for a@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1235
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a <a@test.ex> R=d1 T=tfile
@@ -18,8 +18,8 @@
1999-03-02 09:44:33 10HmaY-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for za@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1236
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 arc_state: <pass>
@@ -27,8 +27,8 @@
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 lh_A-R: < test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 lh-ams: < i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex
1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-000000005vi-0000"
1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
@@ -42,8 +42,8 @@
1999-03-02 09:44:33 10HmbA-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbA-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbA-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zza@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1238
1999-03-02 09:44:33 10HmbB-000000005vi-0000 arc_state: <pass>
@@ -51,8 +51,8 @@
1999-03-02 09:44:33 10HmbB-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbB-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbB-000000005vi-0000 lh_A-R: < test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 lh-ams: < i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for za@test.ex
1999-03-02 09:44:33 10HmbA-000000005vi-0000 => za@test.ex <zza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-000000005vi-0000"
1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
@@ -63,8 +63,8 @@
1999-03-02 09:44:33 10HmbC-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbC-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbC-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 lh-ams: < i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 lh-AAR: < i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex
1999-03-02 09:44:33 10HmbB-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-000000005vi-0000"
1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
@@ -78,8 +78,8 @@
1999-03-02 09:44:33 10HmbD-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbD-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbD-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmbD-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbD-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zmza@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1241
1999-03-02 09:44:33 10HmbE-000000005vi-0000 arc_state: <pass>
@@ -87,8 +87,8 @@
1999-03-02 09:44:33 10HmbE-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbE-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbE-000000005vi-0000 lh_A-R: < test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbE-000000005vi-0000 lh-ams: < i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbE-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for mza@test.ex
1999-03-02 09:44:33 10HmbD-000000005vi-0000 => mza@test.ex <zmza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbE-000000005vi-0000"
1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed
@@ -99,8 +99,8 @@
1999-03-02 09:44:33 10HmbF-000000005vi-0000 arc_oldest_pass <2>
1999-03-02 09:44:33 10HmbF-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbF-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbF-000000005vi-0000 lh-ams: < i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbF-000000005vi-0000 oldest-p-ams: <i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1>
+1999-03-02 09:44:33 10HmbF-000000005vi-0000 lh-AAR: < i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbF-000000005vi-0000 oldest-p-AAR: <i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1>
1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for za@test.ex
1999-03-02 09:44:33 10HmbE-000000005vi-0000 => za@test.ex <mza@test.ex> R=mlist T=tmlist H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-000000005vi-0000"
1999-03-02 09:44:33 10HmbE-000000005vi-0000 Completed
@@ -111,8 +111,8 @@
1999-03-02 09:44:33 10HmbG-000000005vi-0000 arc_oldest_pass <2>
1999-03-02 09:44:33 10HmbG-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbG-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1: test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbG-000000005vi-0000 lh-ams: < i=3; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1: i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbG-000000005vi-0000 oldest-p-ams: <i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1>
+1999-03-02 09:44:33 10HmbG-000000005vi-0000 lh-AAR: < i=3; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1: i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbG-000000005vi-0000 oldest-p-AAR: <i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1>
1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex
1999-03-02 09:44:33 10HmbF-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-000000005vi-0000"
1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
@@ -126,8 +126,8 @@
1999-03-02 09:44:33 10HmbH-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbH-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbH-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmbH-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbH-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbH-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbH-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbH-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zzmza@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1245
1999-03-02 09:44:33 10HmbI-000000005vi-0000 arc_state: <pass>
@@ -135,8 +135,8 @@
1999-03-02 09:44:33 10HmbI-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbI-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbI-000000005vi-0000 lh_A-R: < test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbI-000000005vi-0000 lh-ams: < i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbI-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbI-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for zmza@test.ex
1999-03-02 09:44:33 10HmbH-000000005vi-0000 => zmza@test.ex <zzmza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-000000005vi-0000"
1999-03-02 09:44:33 10HmbH-000000005vi-0000 Completed
@@ -147,8 +147,8 @@
1999-03-02 09:44:33 10HmbJ-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbJ-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbJ-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbJ-000000005vi-0000 lh-ams: < i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbJ-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbJ-000000005vi-0000 lh-AAR: < i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbJ-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbJ-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for mza@test.ex
1999-03-02 09:44:33 10HmbI-000000005vi-0000 => mza@test.ex <zmza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-000000005vi-0000"
1999-03-02 09:44:33 10HmbI-000000005vi-0000 Completed
@@ -159,8 +159,8 @@
1999-03-02 09:44:33 10HmbK-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbK-000000005vi-0000 reason: <AMS body hash miscompare>
1999-03-02 09:44:33 10HmbK-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbK-000000005vi-0000 lh-ams: < i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbK-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbK-000000005vi-0000 lh-AAR: < i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbK-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbK-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss for za@test.ex
1999-03-02 09:44:33 10HmbJ-000000005vi-0000 => za@test.ex <mza@test.ex> R=mlist T=tmlist H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-000000005vi-0000"
1999-03-02 09:44:33 10HmbJ-000000005vi-0000 Completed
@@ -171,8 +171,8 @@
1999-03-02 09:44:33 10HmbL-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbL-000000005vi-0000 reason: <i=3 (cv)>
1999-03-02 09:44:33 10HmbL-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.remote-ip=127.0.0.1: test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbL-000000005vi-0000 lh-ams: < i=3; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.remote-ip=127.0.0.1: i=2; test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbL-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbL-000000005vi-0000 lh-AAR: < i=3; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.remote-ip=127.0.0.1: i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbL-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbL-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss for a@test.ex
1999-03-02 09:44:33 10HmbK-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-000000005vi-0000"
1999-03-02 09:44:33 10HmbK-000000005vi-0000 Completed
@@ -186,8 +186,8 @@
1999-03-02 09:44:33 10HmbM-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbM-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbM-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmbM-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbM-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbM-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbM-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbM-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for zza@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1250
1999-03-02 09:44:33 10HmbN-000000005vi-0000 arc_state: <pass>
@@ -195,8 +195,8 @@
1999-03-02 09:44:33 10HmbN-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbN-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbN-000000005vi-0000 lh_A-R: < test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbN-000000005vi-0000 lh-ams: < i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbN-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbN-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbN-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for za@test.ex
1999-03-02 09:44:33 10HmbM-000000005vi-0000 => za@test.ex <zza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-000000005vi-0000"
1999-03-02 09:44:33 10HmbM-000000005vi-0000 Completed
@@ -207,8 +207,8 @@
1999-03-02 09:44:33 10HmbO-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmbO-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbO-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbO-000000005vi-0000 lh-ams: < i=1; test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbO-000000005vi-0000 oldest-p-ams: <i=1; test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmbO-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
+1999-03-02 09:44:33 10HmbO-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n arc=none>
1999-03-02 09:44:33 10HmbO-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss ARC for a@test.ex
1999-03-02 09:44:33 10HmbN-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbO-000000005vi-0000"
1999-03-02 09:44:33 10HmbN-000000005vi-0000 Completed
@@ -224,8 +224,8 @@
1999-03-02 09:44:33 10HmbP-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbP-000000005vi-0000 reason: <AMS body hash miscompare>
1999-03-02 09:44:33 10HmbP-000000005vi-0000 lh_A-R: < dragon.trusteddomain.org; sender-id=fail (NotPermitted) header.sender=arc-discuss-bounces@dmarc.org; spf=fail (NotPermitted) smtp.mfrom=arc-discuss-bounces@dmarc.org: dragon.trusteddomain.org; dkim=pass\n reason="1024-bit key"\n header.d=convivian.com header.i=@convivian.com header.b=LHXEAl5e;\n dkim-adsp=pass: dragon.trusteddomain.org;\n sender-id=pass header.from=jered@convivian.com;\n spf=pass smtp.mfrom=jered@convivian.com>
-1999-03-02 09:44:33 10HmbP-000000005vi-0000 lh-ams: < i=1; mailhub.convivian.com; none>
-1999-03-02 09:44:33 10HmbP-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbP-000000005vi-0000 lh-AAR: < i=1; mailhub.convivian.com; none>
+1999-03-02 09:44:33 10HmbP-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbP-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=dmarc.org id=1426665656.110316.1517535248039.JavaMail.zimbra@convivian.com for za@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1253
1999-03-02 09:44:33 10HmbQ-000000005vi-0000 DKIM: d=dmarc.org s=clochette c=simple/simple a=rsa-sha256 b=1024 t=1517535263 [verification succeeded]
@@ -235,8 +235,8 @@
1999-03-02 09:44:33 10HmbQ-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbQ-000000005vi-0000 reason: <i=2 (cv)>
1999-03-02 09:44:33 10HmbQ-000000005vi-0000 lh_A-R: < test.ex;\n dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256;\n dkim=fail (body hash mismatch; body probably modified in transit)\n header.d=convivian.com header.s=default header.a=rsa-sha256;\n arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.remote-ip=127.0.0.1: dragon.trusteddomain.org; sender-id=fail (NotPermitted) header.sender=arc-discuss-bounces@dmarc.org; spf=fail (NotPermitted) smtp.mfrom=arc-discuss-bounces@dmarc.org: dragon.trusteddomain.org; dkim=pass\n reason="1024-bit key"\n header.d=convivian.com header.i=@convivian.com header.b=LHXEAl5e;\n dkim-adsp=pass: dragon.trusteddomain.org;\n sender-id=pass header.from=jered@convivian.com;\n spf=pass smtp.mfrom=jered@convivian.com>
-1999-03-02 09:44:33 10HmbQ-000000005vi-0000 lh-ams: < i=2; test.ex;\n dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256;\n dkim=fail (body hash mismatch; body probably modified in transit)\n header.d=convivian.com header.s=default header.a=rsa-sha256;\n arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.remote-ip=127.0.0.1: i=1; mailhub.convivian.com; none>
-1999-03-02 09:44:33 10HmbQ-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbQ-000000005vi-0000 lh-AAR: < i=2; test.ex; smtp.remote-ip=127.0.0.1;\n dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256;\n dkim=fail (body hash mismatch; body probably modified in transit)\n header.d=convivian.com header.s=default header.a=rsa-sha256;\n arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.remote-ip=127.0.0.1: i=1; mailhub.convivian.com; none>
+1999-03-02 09:44:33 10HmbQ-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbQ-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss DKIM=dmarc.org id=1426665656.110316.1517535248039.JavaMail.zimbra@convivian.com for a@test.ex
1999-03-02 09:44:33 10HmbP-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbQ-000000005vi-0000"
1999-03-02 09:44:33 10HmbP-000000005vi-0000 Completed
@@ -250,8 +250,8 @@
1999-03-02 09:44:33 10HmbR-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbR-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbR-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmbR-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbR-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbR-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbR-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbR-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for za@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1255
1999-03-02 09:44:33 10HmbR-000000005vi-0000 ARC: AMS signing: privkey PEM-block import: error:1E08010C:DECODER routines::unsupported
@@ -261,8 +261,8 @@
1999-03-02 09:44:33 10HmbS-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbS-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbS-000000005vi-0000 lh_A-R: < test.ex;\n arc=none>
-1999-03-02 09:44:33 10HmbS-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbS-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbS-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbS-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbS-000000005vi-0000 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss for a@test.ex
1999-03-02 09:44:33 10HmbR-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbS-000000005vi-0000"
1999-03-02 09:44:33 10HmbR-000000005vi-0000 Completed
@@ -278,6 +278,6 @@
1999-03-02 09:44:33 10HmbT-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmbT-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmbT-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmbT-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmbT-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmbT-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmbT-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmbT-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for a@test.ex
diff --git a/test/log/4561 b/test/log/4561
index c1bdc3fac..e9bef2b90 100644
--- a/test/log/4561
+++ b/test/log/4561
@@ -6,8 +6,8 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 reason: <(sequence; expected i=1)>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh_A-R: < test.ex;\n iprev=fail;\n auth=pass (PLAIN) smtp.auth=fred@test.ex>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-ams: < i=2; test.ex;\n iprev=fail;\n auth=pass (PLAIN) smtp.auth=fred@test.ex>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-AAR: < i=2; test.ex;\n iprev=fail;\n auth=pass (PLAIN) smtp.auth=fred@test.ex>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=3885245d-3bae-66a2-7a1e-0dbceae2fb50@test.ex for a@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1235
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a <a@test.ex> R=d1 T=tfile
diff --git a/test/log/4562 b/test/log/4562
index 0df43e55b..0c7cb7a74 100644
--- a/test/log/4562
+++ b/test/log/4562
@@ -6,16 +6,16 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh_A-R: < test.ex; arc=none>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-ams: < i=1; test.ex; arc=none>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-ams: <i=1; test.ex; arc=none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-AAR: < i=1; test.ex; arc=none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; arc=none>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= has_arc@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss ARC id=qwerty1234@disco-zombie.net for a@test.ex
1999-03-02 09:44:33 10HmaY-000000005vi-0000 arc_state: <none>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 domains: <>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 arc_oldest_pass <1>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 reason: <>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh_A-R: <>
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh-ams: <>
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= no_arc@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net for a@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1235
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a <a@test.ex> R=d1 T=tfile
diff --git a/test/log/4563 b/test/log/4563
index efbbcf588..3b578d517 100644
--- a/test/log/4563
+++ b/test/log/4563
@@ -6,8 +6,8 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 arc_oldest_pass <0>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 reason: <AMS sig nonverify>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh_A-R: < test.ex; arc=none>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-ams: < i=2; test.ex; arc=none: i=1; test.ex; arc=none>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-ams: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-AAR: < i=2; test.ex; arc=none: i=1; test.ex; arc=none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-AAR: <>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net for a@test.ex
1999-03-02 09:44:33 Start queue run: pid=p1235
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a <a@test.ex> R=d1 T=tfile
diff --git a/test/log/4690 b/test/log/4690
new file mode 100644
index 000000000..44b3b8958
--- /dev/null
+++ b/test/log/4690
@@ -0,0 +1,57 @@
+
+******** SERVER ********
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 arc_state: <none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 domains: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 arc_oldest_pass <0>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 reason: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh_A-R: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 lh-AAR: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 oldest-p-AAR: <>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 DMARC results: spf_domain=test.ex dmarc_domain=test.ex spf_align=yes dkim_align=no enforcement='Accept'
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 dmarc_status <accept>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 dmarc_status_text <Accept>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 dmarc_used_domain <test.ex>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 dmarc_domain_policy <none>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Authentication-Results: test.ex;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex H=(xxx) [127.0.0.1] P=smtp S=sss for zza@test.ex
+1999-03-02 09:44:33 Start queue run: pid=p1235
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 arc_state: <pass>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 domains: <test.ex>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 arc_oldest_pass <1>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 reason: <>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh_A-R: < test.ex;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 lh-AAR: < i=1; test.ex; smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 DMARC results: spf_domain=test.ex dmarc_domain=test.ex spf_align=yes dkim_align=no enforcement='Accept'
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 dmarc_status <accept>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 dmarc_status_text <Accept>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 dmarc_used_domain <test.ex>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 dmarc_domain_policy <none>
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Authentication-Results: test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@test.ex H=localhost (test.ex) [127.0.0.1] P=esmtp K S=sss ARC for za@test.ex
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => za@test.ex <zza@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] K C="250- 1nn byte chunk, total 1nn\\n250 OK id=10HmaY-000000005vi-0000"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1235
+1999-03-02 09:44:33 Start queue run: pid=p1236
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 arc_state: <pass>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 domains: <test.ex:test.ex>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 arc_oldest_pass <1>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 reason: <>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 lh_A-R: < test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: test.ex;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 lh-AAR: < i=2; test.ex; smtp.remote-ip=127.0.0.1;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1: i=1; test.ex; smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 oldest-p-AAR: <i=1; test.ex; smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=none>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 DMARC results: spf_domain=test.ex dmarc_domain=test.ex spf_align=yes dkim_align=no enforcement='Accept'
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 dmarc_status <accept>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 dmarc_status_text <Accept>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 dmarc_used_domain <test.ex>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 dmarc_domain_policy <none>
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Authentication-Results: test.ex;\n iprev=pass (localhost) smtp.remote-ip=127.0.0.1;\n spf=pass smtp.mailfrom=test.ex;\n dmarc=pass header.from=test.ex;\n arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@test.ex H=localhost (test.ex) [127.0.0.1] P=esmtp K S=sss ARC for a@test.ex
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] K C="250- 2nn byte chunk, total 2nn\\n250 OK id=10HmaZ-000000005vi-0000"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1236
+1999-03-02 09:44:33 Start queue run: pid=p1237
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => a <a@test.ex> R=d1 T=tfile
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1237
diff --git a/test/mail/4560.a b/test/mail/4560.a
index 4d904278e..234a54e5a 100644
--- a/test/mail/4560.a
+++ b/test/mail/4560.a
@@ -38,10 +38,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for a@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
- b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
- AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
- s8DrtRVB3Tt8T/4g8L2SRY0=;
-ARC-Authentication-Results: i=1; test.ex;
+ b=1WIsU9bnj5eAXJuTBjQIEmuhuzJcPtBUJhL1FgyJ6baycKwrLLyIssyx/6Viio6BqaH6+ga2YW
+ kMzlYwiSMAo1GB4HgFSkk2hsFggtL6pSTO7pf3h+mi2Id+wuzQP+Pkp+ZD3xRkpmFqHtrP1eK5
+ 2L21YoWFRum8v5bAKk7ps4c=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
@@ -72,10 +72,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for a@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
- b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy
- u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6
- e7tMbokkI+KFMnpG+G1Xjyk=;
-ARC-Authentication-Results: i=2; test.ex;
+ b=BpKMUfv872xyyd+0dF631GElxk0jmXuzhSEZmT+zlTIHm53RB3NfqXDsy31ffk75CQ5YhIDKaw
+ iCrfHDbwcuRG63Bud2mdfUuWhKXbREGj9aSVSs8D+Z2irv7D6T5zX1Dym6leEL71206FzSJxHw
+ TiwYO2xg+T16cWizyX4WleY=;
+ARC-Authentication-Results: i=2; test.ex; smtp.remote-ip=127.0.0.1;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
@@ -94,10 +94,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for za@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
- b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
- AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
- s8DrtRVB3Tt8T/4g8L2SRY0=;
-ARC-Authentication-Results: i=1; test.ex;
+ b=1WIsU9bnj5eAXJuTBjQIEmuhuzJcPtBUJhL1FgyJ6baycKwrLLyIssyx/6Viio6BqaH6+ga2YW
+ kMzlYwiSMAo1GB4HgFSkk2hsFggtL6pSTO7pf3h+mi2Id+wuzQP+Pkp+ZD3xRkpmFqHtrP1eK5
+ 2L21YoWFRum8v5bAKk7ps4c=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
@@ -128,10 +128,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for a@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=3; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
- b=advgCcXZhwJFZi5rzQgnThsSOX6MsCpnXWxyub3UbuQI5RonZOw7SwEVJ2j4Q32z1d54wws1/c
- 2MJeB2ChZUy+J0rNrXLEWsZZtOrQDx1fEaGL7sXC8RYshnkboBiN8lbkuoZHUZWPILKIWd5V2M
- pN4yMCO6kQ0wyOoUj8JousQ=;
-ARC-Authentication-Results: i=3; test.ex;
+ b=hcSl2rS19q1ophE/sNVZCnh/EBmCmHBEO0dI1uBYqbPzigyn4dYTbFYvwTU7P5aLZQqDMsE8L+
+ paNdS8Txw+cUbyDPAvOre2s+4Iu7oDGpNWgvitZypVoQNz47insbdbsGHZwu7ZTFpDTMZMDxG9
+ LGNvssRFO2C3itM/nDLSzQI=;
+ARC-Authentication-Results: i=3; test.ex; smtp.remote-ip=127.0.0.1;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1
ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
@@ -150,10 +150,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for za@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
- b=odwQlZ9ZCMTWG30i3IPycNo+3kLWIngjWVJKGF8d8CfNEIEeK7ao89Wy9bPEwcnXHYN2HnDjtL
- UXPiuo0BLPS4UCAvVdBd1Kr/rUHfoIysIFF6OggChI2ZeUqRlkD1GRV7C5LACsDrGR+HQQzXPI
- ugidXguiQVpY4mMgc3Kbr44=;
-ARC-Authentication-Results: i=2; test.ex;
+ b=lVYxYNg6L8tVWRCfCyZQdcaxGW2cdzFWrU6Rn9d2jruRA9DOPWGZ8i4lgwvGdYv2QxNpo6Dt/5
+ jjC7eTljtPJQnVPsZ7CkAfwwHP8FUlAbigmuEo6N4sKtqmdEBv6Cic75pMdPMYhEhtmrsCIBdk
+ xzogtv2CL/8F8gq+tS1oz04=;
+ARC-Authentication-Results: i=2; test.ex; smtp.remote-ip=127.0.0.1;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
@@ -172,10 +172,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for mza@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
- b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
- AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
- s8DrtRVB3Tt8T/4g8L2SRY0=;
-ARC-Authentication-Results: i=1; test.ex;
+ b=1WIsU9bnj5eAXJuTBjQIEmuhuzJcPtBUJhL1FgyJ6baycKwrLLyIssyx/6Viio6BqaH6+ga2YW
+ kMzlYwiSMAo1GB4HgFSkk2hsFggtL6pSTO7pf3h+mi2Id+wuzQP+Pkp+ZD3xRkpmFqHtrP1eK5
+ 2L21YoWFRum8v5bAKk7ps4c=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
@@ -210,10 +210,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for a@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=3; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
- b=SwyS6CAxe1WUpQ6/gjhehp05c2J3qn5TgqiEzNZENLQ0LmoFesan/Hs/WUXsu68TWbk12zSYGl
- j8SymB40wpTVbyI0nB9X3f/EV35apVdZCCbb7fhDcItiaveQAYAQjupnD1Gzf7bvkFnHUNIyvc
- mBRUsVzafYLyWHjoPimb0QE=;
-ARC-Authentication-Results: i=3; test.ex;
+ b=rgKTK6kS5MHWCA/3GsZJkj+tEbi0PKJ0r+zE13V7CR5HlhRlIW4byAQOBR5uBlpjIXzpGOYJvb
+ WUvyoqSi1QBr8e6aA53OOY8M9uG49uVnkvgErIkf4IXRSpTfmkR/lfkoznA30QSg/UpD31A/OS
+ IWHm1Bvex7ptXoh7qkcDMWo=;
+ARC-Authentication-Results: i=3; test.ex; smtp.remote-ip=127.0.0.1;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.remote-ip=127.0.0.1
ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
@@ -241,10 +241,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for mza@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
- b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy
- u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6
- e7tMbokkI+KFMnpG+G1Xjyk=;
-ARC-Authentication-Results: i=2; test.ex;
+ b=BpKMUfv872xyyd+0dF631GElxk0jmXuzhSEZmT+zlTIHm53RB3NfqXDsy31ffk75CQ5YhIDKaw
+ iCrfHDbwcuRG63Bud2mdfUuWhKXbREGj9aSVSs8D+Z2irv7D6T5zX1Dym6leEL71206FzSJxHw
+ TiwYO2xg+T16cWizyX4WleY=;
+ARC-Authentication-Results: i=2; test.ex; smtp.remote-ip=127.0.0.1;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
@@ -263,10 +263,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for zmza@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
- b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
- AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
- s8DrtRVB3Tt8T/4g8L2SRY0=;
-ARC-Authentication-Results: i=1; test.ex;
+ b=1WIsU9bnj5eAXJuTBjQIEmuhuzJcPtBUJhL1FgyJ6baycKwrLLyIssyx/6Viio6BqaH6+ga2YW
+ kMzlYwiSMAo1GB4HgFSkk2hsFggtL6pSTO7pf3h+mi2Id+wuzQP+Pkp+ZD3xRkpmFqHtrP1eK5
+ 2L21YoWFRum8v5bAKk7ps4c=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
@@ -310,10 +310,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for za@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
- b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
- AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
- s8DrtRVB3Tt8T/4g8L2SRY0=;
-ARC-Authentication-Results: i=1; test.ex;
+ b=1WIsU9bnj5eAXJuTBjQIEmuhuzJcPtBUJhL1FgyJ6baycKwrLLyIssyx/6Viio6BqaH6+ga2YW
+ kMzlYwiSMAo1GB4HgFSkk2hsFggtL6pSTO7pf3h+mi2Id+wuzQP+Pkp+ZD3xRkpmFqHtrP1eK5
+ 2L21YoWFRum8v5bAKk7ps4c=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
arc=none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
@@ -347,10 +347,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for a@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
- b=e1ldkzDyxJIvQd+ZOylCkekKOj3WVUZiptsJYuoiM0tsBRoiHA5O6RDwrNzCQxRWT05PzW3GBy
- Dkiejo2w30n9QBueQH4h8BvCl/QMlmmdaIy02ZKqfvtp1hxR125TREXdigK9ULQZF4rIrDma5S
- hpd7e9cat3tVvL+aDVT6qBc=;
-ARC-Authentication-Results: i=2; test.ex;
+ b=Arb1wGCte7UUR5c0p37zQ18YW3/X5St95wIStSACUHtWn8IRCaFfb6DJ9j7VnnJznmhjhYKcg3
+ 5L+Sf/VOYHi2z67eoMXZ6ZB1J3giqmNLD6MqllLaXsH3yqdmO9SRG19KBh56ZG8HILgNgw3hkC
+ wJ1OUmg359gm9hk3qYXIgvY=;
+ARC-Authentication-Results: i=2; test.ex; smtp.remote-ip=127.0.0.1;
dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256;
dkim=fail (body hash mismatch; body probably modified in transit)
header.d=convivian.com header.s=default header.a=rsa-sha256;
diff --git a/test/mail/4565.a b/test/mail/4565.a
index 6be8edafe..10cb76c81 100644
--- a/test/mail/4565.a
+++ b/test/mail/4565.a
@@ -12,10 +12,10 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
for a@test.ex;
Tue, 2 Mar 1999 09:44:33 +0000
ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
- b=1J94ImExSjtnwHY/c/aN3BX/xlnQfi6CPdGQvbeSdsbCCEtOqK9547tA54tYFh8beeVECAR0xu
- 9fCSAjZ/0WM7mrxKNMbWkoHNoejUhNkcxJOtFmiS/0JKPQGk8HTE7FHLbogUQvEJoVBBnqo6xW
- nFtzlI3JfLnWvB3FQ316xLs=;
-ARC-Authentication-Results: i=1; test.ex;
+ b=guJqF/mOsuUjSLbdDSMvwf13qMVw2TPUmUhp37HWgIFppyAwBueoEQ+tqaxZBhqw54W9TiHA8o
+ JTsfWJemHwDWiP4BI9ccdeiWrpAIxb2QfL09oybcs6sQHMTvYsWItmuWQlMMsGMqTtrNdi1E+B
+ WHu89huK0FxZOBBJpj634IQ=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
dkim=fail (body hash mismatch; body probably modified in transit)
header.d=example.com header.s=sel header.a=rsa-sha256;
arc=none
diff --git a/test/mail/4690.a b/test/mail/4690.a
new file mode 100644
index 000000000..b9d2a1a09
--- /dev/null
+++ b/test/mail/4690.a
@@ -0,0 +1,67 @@
+From CALLER@test.ex Tue Mar 02 09:44:33 1999
+Authentication-Results: test.ex;
+ iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
+ spf=pass smtp.mailfrom=test.ex;
+ dmarc=pass header.from=test.ex;
+ arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
+Received: from localhost ([127.0.0.1] helo=test.ex)
+ by test.ex with esmtp (Exim x.yz)
+ (envelope-from <CALLER@test.ex>)
+ id 10HmaZ-000000005vi-0000
+ for a@test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
+ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
+ b=OzDYecPkQoqA16q0dDASO39Eay+pylGCs/4RiR5an1lw1fq7Lu8u6yhnzLySkR777csWnaGebP
+ HA5SYBIQ0eSWFbMbs5B2dR5APaUIfu4Vvsvrlj9IWyNwI9TdTbrQsePy4dnd8WFNXLiiHTL7GJ
+ cdm3SxO7jJM0MFe3MEvqCu4=;
+ARC-Authentication-Results: i=2; test.ex; smtp.remote-ip=127.0.0.1;
+ iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
+ spf=pass smtp.mailfrom=test.ex;
+ dmarc=pass header.from=test.ex;
+ arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
+ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
+ bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
+ h=From:Subject;
+ b=vvajkPsGZ5v5OVCvDnPGZeCGtjCkLVOICQqFbbeUGPbeULu0YuzvDyEtSae2eWhbCLyJK6eCbN
+ sRKBMkuZHH+Q5Drlx5xAFcIJqzdj9Vpfx3Wy/Rif1yKGiwzlQ8rtuf6eF7rWseDjjLR2vww2GS
+ dqUNp6aMd8hfWPpXaJ1RIac=;
+Authentication-Results: test.ex;
+ iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
+ spf=pass smtp.mailfrom=test.ex;
+ dmarc=pass header.from=test.ex;
+ arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
+Received: from localhost ([127.0.0.1] helo=test.ex)
+ by test.ex with esmtp (Exim x.yz)
+ (envelope-from <CALLER@test.ex>)
+ id 10HmaY-000000005vi-0000
+ for za@test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
+ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
+ b=lEmC1Nc2r9oPcx4h0WxPXzfnw6j0o1F1Ok25rtKz4O6A2Kv9TSOqqtytBlbxJ+mCeGK93ZTJyl
+ 8dRzO3iXk1xLW4n12vMe+Y2ufQp7HspPW2xRcyXJJlQnX//8QSRXHoBapPxQd2f2KgXXS2HICx
+ LiXcuLE9Jbs4mPpb9uPV4RQ=;
+ARC-Authentication-Results: i=1; test.ex; smtp.remote-ip=127.0.0.1;
+ spf=pass smtp.mailfrom=test.ex;
+ dmarc=pass header.from=test.ex;
+ arc=none
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=test.ex; s=sel;
+ bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=;
+ h=From:Subject;
+ b=HnYnwHbI6HGBLhgfnLys5BL7OjZqwyA7xEBRukSPv/mcJHgeNcmmVhxB7hue4/6+bD47uM27Gl
+ 5qmC0zTGx26326+FEfDBAbZutxECSEZEdg8dhI8bZdO0fNvAD2tO6D+lG0XzqXMKg9woCQX1DV
+ uqlAsrZssxQT8tAc6MnXaP0=;
+Authentication-Results: test.ex;
+ spf=pass smtp.mailfrom=test.ex;
+ dmarc=pass header.from=test.ex;
+ arc=none
+Received: from [127.0.0.1] (helo=xxx)
+ by test.ex with smtp (Exim x.yz)
+ (envelope-from <CALLER@test.ex>)
+ id 10HmaX-000000005vi-0000
+ for zza@test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
+Subject: Test
+From: <CALLER@test.ex>
+
+This is a test body.
+
diff --git a/test/scripts/4500-DKIM/4500 b/test/scripts/4500-DKIM/4500
index 2d1f2f35e..d1cc646f9 100644
--- a/test/scripts/4500-DKIM/4500
+++ b/test/scripts/4500-DKIM/4500
@@ -7,7 +7,7 @@ exim -DSERVER=server -DMSIZE='rsa=512 ed25519=250' -bd -oX PORT_D
# - sha1, 1024b
# Mail original in aux-fixed/4500.msg1.txt
# Sig generated by: perl aux-fixed/dkim/sign.pl --method=simple/simple < aux-fixed/4500.msg1.txt
-# NB: simpla canon does not affect tabs-vs-spaces in header continuation lines, which
+# NB: simple canon does not affect tabs-vs-spaces in header continuation lines, which
# likely matters in the DKIM sig header. Take care!
client 127.0.0.1 PORT_D
??? 220
diff --git a/test/scripts/4690-DMARC-ARC/4690 b/test/scripts/4690-DMARC-ARC/4690
new file mode 100644
index 000000000..18210785a
--- /dev/null
+++ b/test/scripts/4690-DMARC-ARC/4690
@@ -0,0 +1,45 @@
+# DMARC history-report of ARC results
+#
+mkdir DIR/tmp
+sudo chmod 777 DIR/tmp
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+# We send this one through two forwarding hops.
+# It starts off bare, so the 1st forwarder reception gets an ARC status of "none".
+# The outbound signs it with that, and the 2nd forwarder is happy to pass it.
+# The outbound signs again, and the final receiver is happy.
+#
+client 127.0.0.1 PORT_D
+??? 220
+HELO xxx
+??? 250
+MAIL FROM:<CALLER@test.ex>
+??? 250
+RCPT TO:<zza@test.ex>
+??? 250
+DATA
+??? 354
+Subject: Test
+From: <CALLER@test.ex>
+
+This is a test body.
+.
+??? 250
+QUIT
+??? 221
+****
+#
+exim -DSERVER=server -DNOTDAEMON -q
+****
+exim -DSERVER=server -DNOTDAEMON -q
+****
+exim -DSERVER=server -DNOTDAEMON -q
+****
+#
+killdaemon
+cat DIR/tmp/TESTNUM.hist.dmarc
+#
+sudo rm -fr DIR/tmp
+no_msglog_check
diff --git a/test/scripts/4690-DMARC-ARC/REQUIRES b/test/scripts/4690-DMARC-ARC/REQUIRES
new file mode 100644
index 000000000..9d8d25739
--- /dev/null
+++ b/test/scripts/4690-DMARC-ARC/REQUIRES
@@ -0,0 +1,3 @@
+support DMARC
+support DKIM
+support Experimental_ARC
diff --git a/test/stdout/4650 b/test/stdout/4650
index 1afe0217c..4da1909c6 100644
--- a/test/stdout/4650
+++ b/test/stdout/4650
@@ -67,6 +67,8 @@ sp 0
align_dkim 5
align_spf 5
action 2
+arc 11
+arc_policy $d json:[]
job 10HmaY-000000005vi-0000
reporter myhost.test.ex
received 1692480217
@@ -86,3 +88,5 @@ sp 0
align_dkim 4
align_spf 5
action 2
+arc 11
+arc_policy $d json:[]
diff --git a/test/stdout/4690 b/test/stdout/4690
new file mode 100644
index 000000000..e76a46806
--- /dev/null
+++ b/test/stdout/4690
@@ -0,0 +1,86 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO xxx
+??? 250
+<<< 250 test.ex Hello xxx [127.0.0.1]
+>>> MAIL FROM:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<zza@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: Test
+>>> From: <CALLER@test.ex>
+>>>
+>>> This is a test body.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-000000005vi-0000
+>>> QUIT
+??? 221
+<<< 221 test.ex closing connection
+End of script
+job 10HmaX-000000005vi-0000
+reporter test.ex
+received 1692480217
+ipaddr 127.0.0.1
+from test.ex
+mfrom test.ex
+spf 0
+pdomain test.ex
+policy 15
+rua -
+pct 100
+adkim 114
+aspf 114
+p 110
+sp 0
+align_dkim 5
+align_spf 4
+action 2
+arc 11
+arc_policy 1 json[ ]
+job 10HmaY-000000005vi-0000
+reporter test.ex
+received 1692480217
+ipaddr 127.0.0.1
+from test.ex
+mfrom test.ex
+spf 0
+pdomain test.ex
+policy 15
+rua -
+pct 100
+adkim 114
+aspf 114
+p 110
+sp 0
+align_dkim 5
+align_spf 4
+action 2
+arc 0
+arc_policy 0 json[ ("i":1, "d":"test.ex", "s":"sel", "ip":"127.0.0.1") ]
+job 10HmaZ-000000005vi-0000
+reporter test.ex
+received 1692480217
+ipaddr 127.0.0.1
+from test.ex
+mfrom test.ex
+spf 0
+pdomain test.ex
+policy 15
+rua -
+pct 100
+adkim 114
+aspf 114
+p 110
+sp 0
+align_dkim 5
+align_spf 4
+action 2
+arc 0
+arc_policy 0 json[ ("i":1, "d":"test.ex", "s":"sel", "ip":"127.0.0.1"), ("i":2, "d":"test.ex", "s":"sel", "ip":"127.0.0.1") ]
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 10:45:09 +0000