fix greylist for Exim 4.94

diff --git a/include/acl-greylist-sqlite b/include/acl-greylist-sqlite
index e15aa9e93f2104ed836712a3e3533548b35c704e..799e1507fe63dd71152ea51359328be809c0c656 100644 (file)
--- a/include/acl-greylist-sqlite
+++ b/include/acl-greylist-sqlite
@@ -1,6 +1,8 @@
 # $Id: acl-greylist-sqlite,v 1.3 2007/11/25 19:17:28 dwmw2 Exp $
 
+.ifndef EXIM494
 GREYDB=/var/spool/exim/db/greylist.db
+.endif
 
 # ACL for greylisting. Place reason(s) for greylisting into a variable named
 # $acl_m_greylistreasons before invoking with 'require acl = greylist_mail'.

diff --git a/master b/master
index f679b6a407527645f36d1a423392d1034fed28a4..3b541585b384e5720346a2028adb1ef51ae6a1cd 100644 (file)
--- a/master
+++ b/master
@@ -189,6 +189,10 @@ smtp_banner = $primary_hostname ESMTP Exim $version_number $tod_full\n\
            obligations or waivers or any other clauses contained therein shall apply\n\
            unless explicitly agreed to by the recipient(s).
 
+.ifdef EXIM494
+sqlite_dbfile = /var/spool/exim/db/greylist.db
+.endif
+
 ######################################################################
 #                        ACCESS CONTROL LISTS                        #
 ######################################################################

diff --git a/sites/desiato b/sites/desiato
index 154fd4b2807b405ce4fd6f9a1cbe9269fdb61064..c7ef7d6aff6561f81a097bcf192ffa1aee9e1807 100644 (file)
--- a/sites/desiato
+++ b/sites/desiato
@@ -15,6 +15,7 @@ DKIM_SELECTOR=merlin.20200630
 
 DNS_VIRTUAL=CLUSTER/dns-virtual-domains
 
+EXIM494=EXIM494
 CRM114=CRM114
 spamd_address = ${if def:acl_m_spamd_address {$acl_m_spamd_address} {127.0.0.1 783}}