Removed the WITH_CONTENT_SCAN conditionals from the fakereject feature of

[exim.git] / src / src / acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index 247ffbb62ebe13a7783d2571c9e858d445a6cb8d..e3f4cf8613effb8fb3e45cdda40c7124958fb8c0 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.6 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.8 2004/12/29 16:00:58 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -248,7 +248,7 @@ static unsigned int cond_forbids[] = {
 
   0,                                               /* delay */
   
-#ifdef WITH_CONTENT_SCAN
+#ifdef WITH_OLD_DEMIME
   (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)|      /* demime */
     (1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
     (1<<ACL_WHERE_RCPT)|(1<<ACL_WHERE_PREDATA)|
@@ -1651,7 +1651,6 @@ for (; cb != NULL; cb = cb->next)
       no_multiline_responses = TRUE;
       break;
 
-#ifdef WITH_CONTENT_SCAN
       case CONTROL_FAKEREJECT:
       fake_reject = TRUE;
       if (*p == '/')
@@ -1667,7 +1666,6 @@ for (; cb != NULL; cb = cb->next)
         fake_reject_text = US"Your message has been rejected but is being kept for evaluation.\nIf it was a legit message, it may still be delivered to the target recipient(s).";
         }
       break;
-#endif
 
       case CONTROL_FREEZE:
       deliver_freeze = TRUE;