ph10 2005/04/07 16:40:50 BST
Modified files:
exim-src/src deliver.c receive.c
Log:
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.
Revision Changes Path
1.13 +1 -1 exim/exim-src/src/deliver.c
1.15 +2 -0 exim/exim-src/src/receive.c
Index: deliver.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- deliver.c 7 Apr 2005 15:37:14 -0000 1.12
+++ deliver.c 7 Apr 2005 15:40:50 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/deliver.c,v 1.12 2005/04/07 15:37:14 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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 */
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- receive.c 6 Apr 2005 16:43:59 -0000 1.14
+++ receive.c 7 Apr 2005 15:40:50 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.14 2005/04/06 16:43:59 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
+#ifdef WITH_CONTENT_SCAN
/*************************************************
* Run the MIME ACL on a message *
@@ -1147,6 +1148,7 @@
return TRUE;
}
+#endif /* WITH_CONTENT_SCAN */
/*************************************************
