diff options
| -rw-r--r-- | src/src/arc.c | 8 | ||||
| -rw-r--r-- | src/src/expand.c | 4 | ||||
| -rw-r--r-- | src/src/malware.c | 40 |
3 files changed, 44 insertions, 8 deletions
diff --git a/src/src/arc.c b/src/src/arc.c index 7374ba405..787c6e1e2 100644 --- a/src/src/arc.c +++ b/src/src/arc.c @@ -1800,20 +1800,20 @@ for (as = arc_verify_ctx.arcset_chain, inst = 1; as; as = as->next, inst++) blob * d = &hdr_as->d; for (; inst < as->instance; inst++) - g = string_catn(g, ":", 1); + g = string_catn(g, US":", 1); g = d->data && d->len ? string_append_listele_n(g, ':', d->data, d->len) - : string_catn(g, ":", 1); + : string_catn(g, US":", 1); } else - g = string_catn(g, ":", 1); + g = string_catn(g, US":", 1); } return g ? g->s : US""; } -/* Construct an Authenticate-Results header portion, for the ARC module */ +/* Construct an Authentication-Results header portion, for the ARC module */ gstring * authres_arc(gstring * g) diff --git a/src/src/expand.c b/src/src/expand.c index d9ce07e46..862544c76 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1666,7 +1666,7 @@ return yield; -/* Append a "local" element to an Autherntication-Results: header +/* Append a "local" element to an Authentication-Results: header if this was a non-smtp message. */ @@ -1681,7 +1681,7 @@ return g; } -/* Append an "iprev" element to an Autherntication-Results: header +/* Append an "iprev" element to an Authentication-Results: header if we have attempted to get the calling host's name. */ diff --git a/src/src/malware.c b/src/src/malware.c index 99fa1c347..a5de8a938 100644 --- a/src/src/malware.c +++ b/src/src/malware.c @@ -12,8 +12,44 @@ #include "exim.h" #ifdef WITH_CONTENT_SCAN /* entire file */ -typedef enum {M_FPROTD, M_DRWEB, M_AVES, M_FSEC, M_KAVD, M_CMDL, - M_SOPHIE, M_CLAMD, M_SOCK, M_MKSD, M_AVAST, M_FPROT6D} scanner_t; +typedef enum { +#ifndef DISABLE_MAL_FFROTD + M_FPROTD, +#endif +#ifndef DISABLE_MAL_FFROT6D + M_FPROT6D, +#endif +#ifndef DISABLE_MAL_DRWEB + M_DRWEB, +#endif +#ifndef DISABLE_MAL_AVE + M_AVES, +#endif +#ifndef DISABLE_MAL_FSECURE + M_FSEC, +#endif +#ifndef DISABLE_MAL_KAV + M_KAVD, +#endif +#ifndef DISABLE_MAL_SOPHIE + M_SOPHIE, +#endif +#ifndef DISABLE_MAL_CLAM + M_CLAMD, +#endif +#ifndef DISABLE_MAL_MKS + M_MKSD, +#endif +#ifndef DISABLE_MAL_AVAST + M_AVAST, +#endif +#ifndef DISABLE_MAL_SOCK + M_SOCK, +#endif +#ifndef DISABLE_MAL_CMDLINE + M_CMDL, +#endif + } scanner_t; typedef enum {MC_NONE, MC_TCP, MC_UNIX, MC_STRM} contype_t; static struct scan { |