merlin updated to 4.94

diff --git a/include/acl-greylist-sqlite b/include/acl-greylist-sqlite
index a79b6afa8f15d608a3f4acc8cd188a311cf26dca..d3ac8e8d9825da8cc8b9d17ef851c27333b5e5ce 100644 (file)
--- a/include/acl-greylist-sqlite
+++ b/include/acl-greylist-sqlite
@@ -1,7 +1,8 @@
 # $Id: acl-greylist-sqlite,v 1.3 2007/11/25 19:17:28 dwmw2 Exp $
 
+.ifdef EXIM494
 GREYDB=
-.ifndef EXIM494
+.else
 GREYDB=/var/spool/exim/db/greylist.db
 .endif
 

diff --git a/sites/merlin b/sites/merlin
index 2557bcab8795a330577aa6b0415109285e5a10cf..6df9b2730f4a275ea5291e56165c9b5a34c90e99 100644 (file)
--- a/sites/merlin
+++ b/sites/merlin
@@ -15,6 +15,7 @@ MAILMAN_GID=mailman
 
 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}}