diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-07 15:40:50 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-07 15:40:50 +0000 |
| commit | 63955bf2d9be6412f7d1b77e46f56ccbaf4c816e (patch) | |
| tree | 8520bd8c4d55c8ce6bf0d193b9f35644221b56de | |
| parent | d71748467d1443be8c3b84a23839ea975c125b0d (diff) | |
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.
| -rw-r--r-- | src/src/deliver.c | 4 | ||||
| -rw-r--r-- | src/src/receive.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index d610b38ca..78eb65bc6 100644 --- 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 dc0ff69a6..c83bca664 100644 --- 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 */ /************************************************* |