diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-01-02 18:22:05 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-01-02 18:22:05 +0000 |
| commit | 0f9b04830a9428a58730cc6a60faa9a169522dc3 (patch) | |
| tree | a8f00eedd242da27f71801b1a0fcd103b243cc71 | |
| parent | 3864bb8e1283351bab3290bcffb70c33437b3ac3 (diff) | |
Missed out a couple of fakereject cases that were still #ifdef-ed with
CONTENT_SCAN.
| -rw-r--r-- | src/src/acl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/src/acl.c b/src/src/acl.c index 3f343c183..97a9dbe5e 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/acl.c,v 1.9 2004/12/29 16:34:31 ph10 Exp $ */ +/* $Cambridge: exim/src/src/acl.c,v 1.10 2005/01/02 18:22:05 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -373,9 +373,9 @@ enum { CONTROL_ENFORCE_SYNC, CONTROL_NO_ENFORCE_SYNC, CONTROL_FREEZE, CONTROL_QUEUE_ONLY, CONTROL_SUBMISSION, #ifdef WITH_CONTENT_SCAN - CONTROL_NO_MBOX_UNSPOOL, CONTROL_FAKEREJECT, + CONTROL_NO_MBOX_UNSPOOL, #endif - CONTROL_NO_MULTILINE }; + CONTROL_FAKEREJECT, CONTROL_NO_MULTILINE }; /* Bit map vector of which controls are not allowed at certain times. For each control, there's a bitmap of dis-allowed times. For some, it is easier to @@ -404,8 +404,8 @@ static unsigned int control_forbids[] = { #ifdef WITH_CONTENT_SCAN (1<<ACL_WHERE_NOTSMTP), /* no_mbox_unspool */ - (1<<ACL_WHERE_NOTSMTP), /* fakereject */ #endif + (1<<ACL_WHERE_NOTSMTP), /* fakereject */ (1<<ACL_WHERE_NOTSMTP) /* no_multiline */ }; @@ -431,8 +431,8 @@ static control_def controls_list[] = { { US"queue_only", CONTROL_QUEUE_ONLY, FALSE}, #ifdef WITH_CONTENT_SCAN { US"no_mbox_unspool", CONTROL_NO_MBOX_UNSPOOL, FALSE}, - { US"fakereject", CONTROL_FAKEREJECT, TRUE}, #endif + { US"fakereject", CONTROL_FAKEREJECT, TRUE}, { US"submission", CONTROL_SUBMISSION, TRUE} }; |