From 6f1b3e5dc6e3065e496a2e49949a889f85778720 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 7 Apr 2016 01:09:05 +0100 Subject: [PATCH] Demime: cleanup after WITH_OLD_DEMIME removal --- src/src/EDITME | 7 ------- src/src/buildconfig.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/src/EDITME b/src/src/EDITME index d852103c4..5745bb391 100644 --- a/src/src/EDITME +++ b/src/src/EDITME @@ -392,13 +392,6 @@ EXIM_MONITOR=eximon.bin # WITH_CONTENT_SCAN=yes -# If you want to use the deprecated "demime" condition in the DATA ACL, -# uncomment the line below. Doing so will also explicitly turn on the -# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of -# the "demime" condition. - -# WITH_OLD_DEMIME=yes - #------------------------------------------------------------------------------ # If you're using ClamAV and are backporting fixes to an old version, instead # of staying current (which is the more usual approach) then you may need to diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index 2f1114dcd..3a45cac18 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -727,8 +727,8 @@ else if (isgroup) continue; } - /* WITH_CONTENT_SCAN is another special case: it must be set if either it or - WITH_OLD_DEMIME is set. */ + /* WITH_CONTENT_SCAN is another special case: it must be set if it or + EXPERIMENTAL_DCC is set. */ if (strcmp(name, "WITH_CONTENT_SCAN") == 0) { -- 2.25.1