Forgot to put #ifdef WITH_CONTENT_SCAN round the new run_mime_acl()

function. Also, a typo in a comment in deliver.c got overlooked.

diff --git a/src/src/deliver.c b/src/src/deliver.c
index d610b38ca0adae80dd43f17e70c25935d32605b6..78eb65bc6b2969fcfa5bb56d38f874075c23627c 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/deliver.c,v 1.12 2005/04/07 15:37:14 ph10 Exp $ */
+/* $Cambridge: exim/src/src/deliver.c,v 1.13 2005/04/07 15:40:50 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -5351,7 +5351,7 @@ while (addr_new != NULL)           /* Loop until all addresses dealt with */
     them different redirect_router values, but there are other cases too.
     Therefore, tests for duplicates now take place when routing is complete.
     This is the old code, kept for a while for the record, and in case this
-    radical change has to be backed out for some reason.
+    radical change has to be backed out for some reason. */
 
     #ifdef NEVER
     /* If it's a duplicate, remember what it's a duplicate of */

diff --git a/src/src/receive.c b/src/src/receive.c
index dc0ff69a629df18d43757a7f044318a560bd7194..c83bca664b7b00f0fed90d0c0e466f79c33c3366 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/receive.c,v 1.14 2005/04/06 16:43:59 ph10 Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.15 2005/04/07 15:40:50 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1008,6 +1008,7 @@ return s;
 
 
 
+#ifdef WITH_CONTENT_SCAN
 
 /*************************************************
 *       Run the MIME ACL on a message            *
@@ -1147,6 +1148,7 @@ else if (rc != OK)
 return TRUE;
 }
 
+#endif  /* WITH_CONTENT_SCAN */
 
 
 /*************************************************