From 33acccbaaa7e2683317ddec0e29401683c7d85bc Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 17 Apr 2020 12:37:57 -0700
Subject: [PATCH] only check the p key for dkim

this less-strict DKIM check allows users to set a stronger DKIM key
---
 CHANGES     | 1 +
 src/mail.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8dc5ddada..5432c8956 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1914,4 +1914,5 @@
 
 [5.2.0]
 * acme: request ECC certs
+* less-strict DKIM check to allow users to set a stronger DKIM key
 
diff --git a/src/mail.js b/src/mail.js
index bc4587d90..72e3271bd 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -208,7 +208,8 @@ function checkDkim(mailDomain, callback) {
 
         if (txtRecords.length !== 0) {
             dkim.value = txtRecords[0].join('');
-            dkim.status = (dkim.value === dkim.expected);
+            const actual = txtToDict(dkim.value);
+            dkim.status = actual.p === dkimKey;
         }
 
         callback(null, dkim);