diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-17 14:56:49 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-17 14:59:28 +0000 |
| commit | fd5a6ffbf08d08e17466a3a945293923becc280d (patch) | |
| tree | f0ca917343be4794f5645cf58863ad65a22b116a | |
| parent | 1922a912d23fc06ee7fb0d22d9cf3e633a4713dc (diff) | |
Build-variant tidyup
| -rw-r--r-- | src/src/EDITME | 4 | ||||
| -rw-r--r-- | src/src/exim.h | 2 | ||||
| -rw-r--r-- | src/src/malware.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/src/EDITME b/src/src/EDITME index 18821377a..bd5151db1 100644 --- 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 -# 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 @@ -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. -# 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 diff --git a/src/src/exim.h b/src/src/exim.h index 54e8d002d..0de0595b1 100644 --- 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) -# undef DISABLE_DNSSEC +# error DANE support requires DNSSEC support #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 948aedea1..d24f09b88 100644 --- 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 -#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 -#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) |