DMARC: add results to generic authres string; remove $dmarc_ar_header

[exim.git] / src / src / expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index 6f67ab138a26efa5f729fb9b62ebdb06e5cf061b..f1c8544c98a27deec67951e0919b1de5afa20935 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -518,7 +518,6 @@ static var_entry var_table[] = {
   { "dkim_verify_status",  vtype_stringptr,   &dkim_verify_status },
 #endif
 #ifdef EXPERIMENTAL_DMARC
-  { "dmarc_ar_header",     vtype_stringptr,   &dmarc_ar_header },
   { "dmarc_domain_policy", vtype_stringptr,   &dmarc_domain_policy },
   { "dmarc_status",        vtype_stringptr,   &dmarc_status },
   { "dmarc_status_text",   vtype_stringptr,   &dmarc_status_text },
@@ -4149,6 +4148,9 @@ while (*s != 0)
 #ifndef DISABLE_DKIM
       yield = authres_dkim(yield);
 #endif
+#ifdef EXPERIMENTAL_DMARC
+      yield = authres_dmarc(yield);
+#endif
 #ifdef EXPERIMENTAL_ARC
       yield = authres_arc(yield);
 #endif