Build-variant tidyup

diff --git a/src/src/EDITME b/src/src/EDITME
index 18821377a853e14319829a66ac88f916d29d7dc8..bd5151db1012c91fc1a9f65f0d4e09c9c429f103 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -479,7 +479,7 @@ DISABLE_MAL_MKS=yes
 # LDFLAGS += -lsrs_alt
 
 # Uncomment the following line to add DMARC checking capability, implemented
 # LDFLAGS += -lsrs_alt
 
 # Uncomment the following line to add DMARC checking capability, implemented

-# using libopendmarc libraries.  You must have SPF support enabled also.
+# using libopendmarc libraries. You must have SPF and DKIM support enabled also.

 # EXPERIMENTAL_DMARC=yes
 # DMARC_TLD_FILE= /etc/exim/opendmarc.tlds
 # CFLAGS += -I/usr/local/include
 # EXPERIMENTAL_DMARC=yes
 # DMARC_TLD_FILE= /etc/exim/opendmarc.tlds
 # CFLAGS += -I/usr/local/include


@@ -487,7 +487,7 @@ DISABLE_MAL_MKS=yes
 
 # Uncomment the following line to add ARC (Authenticated Received Chain)
 # support.  You must have SPF and DKIM support enabled also.
 
 # Uncomment the following line to add ARC (Authenticated Received Chain)
 # support.  You must have SPF and DKIM support enabled also.

-# EXPERIMENTAL_ARC
+# EXPERIMENTAL_ARC=yes

 
 # Uncomment the following lines to add Brightmail AntiSpam support. You need
 # to have the Brightmail client SDK installed. Please check the experimental
 
 # Uncomment the following lines to add Brightmail AntiSpam support. You need
 # to have the Brightmail client SDK installed. Please check the experimental

diff --git a/src/src/exim.h b/src/src/exim.h
index 54e8d002d218922cda33164080d585ad87952b43..0de0595b1487d2d4e360f2050fb1a9d844ba846e 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -594,7 +594,7 @@ default to EDQUOT if it exists, otherwise ENOSPC. */
 
 /* DANE w/o DNSSEC is useless */
 #if defined(SUPPORT_DANE) && defined(DISABLE_DNSSEC)
 
 /* DANE w/o DNSSEC is useless */
 #if defined(SUPPORT_DANE) && defined(DISABLE_DNSSEC)

-# undef DISABLE_DNSSEC
+# error DANE support requires DNSSEC support

 #endif
 
 /* Some platforms (FreeBSD, OpenBSD, Solaris) do not seem to define this */
 #endif
 
 /* Some platforms (FreeBSD, OpenBSD, Solaris) do not seem to define this */

diff --git a/src/src/malware.c b/src/src/malware.c
index 948aedea18f5880ce691c661dec03b8f99aee00f..d24f09b88794035fd33c89ceed083de2e8022a81 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -2146,13 +2146,13 @@ if (!kav_re_sus)
 if (!kav_re_inf)
   kav_re_inf = regex_must_compile(kav_re_inf_str, FALSE, TRUE);
 #endif
 if (!kav_re_inf)
   kav_re_inf = regex_must_compile(kav_re_inf_str, FALSE, TRUE);
 #endif

-#ifndef DISABLE_MAL_AVA
+#ifndef DISABLE_MAL_AVAST

 if (!ava_re_clean)
   ava_re_clean = regex_must_compile(ava_re_clean_str, FALSE, TRUE);
 if (!ava_re_virus)
   ava_re_virus = regex_must_compile(ava_re_virus_str, FALSE, TRUE);
 #endif
 if (!ava_re_clean)
   ava_re_clean = regex_must_compile(ava_re_clean_str, FALSE, TRUE);
 if (!ava_re_virus)
   ava_re_virus = regex_must_compile(ava_re_virus_str, FALSE, TRUE);
 #endif

-#ifndef DISABLE_MAL_FPROT6D
+#ifndef DISABLE_MAL_FFROT6D

 if (!fprot6d_re_error)
   fprot6d_re_error = regex_must_compile(fprot6d_re_error_str, FALSE, TRUE);
 if (!fprot6d_re_virus)
 if (!fprot6d_re_error)
   fprot6d_re_error = regex_must_compile(fprot6d_re_error_str, FALSE, TRUE);
 if (!fprot6d_re_virus)