From b5d88fede5974a99261a5183263b018d6b46e2d4 Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 21 Aug 2019 19:02:11 +0200
Subject: acl: refactor dkim dns query acl

---
 conf.d/020_acl.conf | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'conf.d')

diff --git a/conf.d/020_acl.conf b/conf.d/020_acl.conf
index 73a8fd3..fe609f3 100644
--- a/conf.d/020_acl.conf
+++ b/conf.d/020_acl.conf
@@ -163,9 +163,8 @@ acl_mta_dkim:
            message       = [DKIM] invalid signature ($dkim_verify_reason).
 
   deny     dkim_status   = none
-           condition     = ${if match \
-                             {${run{DIG_QUERY_COMMAND +short TXT ${quote:_domainkey.$sender_host_address}}}}{/o=-/} \
-                             {yes}{no}}
-           message       = [DKIM] required signature is missing.
+           set_acl_m_dns = ${run{DIG_QUERY_COMMAND +short TXT ${quote:_domainkey.$sender_host_address}}}
+           condition     = ${if match {$acl_m_dns}{/o=-/} {yes}{no}}
+           message       = [DKIM] required signature for $sender_host_address is missing.
 
   accept
-- 
cgit v1.2.3