diff options
| -rw-r--r-- | src/src/acl.c | 4 | ||||
| -rw-r--r-- | src/src/globals.c | 4 | ||||
| -rw-r--r-- | src/src/globals.h | 4 | ||||
| -rw-r--r-- | src/src/receive.c | 28 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 4 |
5 files changed, 15 insertions, 29 deletions
diff --git a/src/src/acl.c b/src/src/acl.c index 128bde552..e3f4cf861 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/acl.c,v 1.7 2004/12/17 14:52:44 ph10 Exp $ */ +/* $Cambridge: exim/src/src/acl.c,v 1.8 2004/12/29 16:00:58 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -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; diff --git a/src/src/globals.c b/src/src/globals.c index bc9484fd9..16b3f76bb 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.11 2004/12/22 12:05:46 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.12 2004/12/29 16:00:58 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -499,10 +499,8 @@ uschar *expand_string_message; BOOL extract_addresses_remove_arguments = TRUE; uschar *extra_local_interfaces = NULL; -#ifdef WITH_CONTENT_SCAN BOOL fake_reject = FALSE; uschar *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)."; -#endif int filter_n[FILTER_VARIABLE_COUNT]; BOOL filter_running = FALSE; int filter_sn[FILTER_VARIABLE_COUNT]; diff --git a/src/src/globals.h b/src/src/globals.h index 1ac9776f4..4ee938d6d 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/globals.h,v 1.8 2004/12/16 15:11:47 tom Exp $ */ +/* $Cambridge: exim/src/src/globals.h,v 1.9 2004/12/29 16:00:58 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -292,10 +292,8 @@ extern BOOL expand_string_forcedfail; /* TRUE if failure was "expected" */ extern BOOL extract_addresses_remove_arguments; /* Controls -t behaviour */ extern uschar *extra_local_interfaces; /* Local, non-listen interfaces */ -#ifdef WITH_CONTENT_SCAN extern BOOL fake_reject; /* TRUE if fake reject is to be given */ extern uschar *fake_reject_text; /* Option for the fakereject control statement: can contain user defined message. Default is in globals.c. */ -#endif extern int filter_n[FILTER_VARIABLE_COUNT]; /* filter variables */ extern BOOL filter_running; /* TRUE while running a filter */ extern int filter_sn[FILTER_VARIABLE_COUNT]; /* variables set by system filter */ diff --git a/src/src/receive.c b/src/src/receive.c index f69e4b673..1194f2f59 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/receive.c,v 1.7 2004/12/17 14:52:44 ph10 Exp $ */ +/* $Cambridge: exim/src/src/receive.c,v 1.8 2004/12/29 16:00:58 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -3394,29 +3394,21 @@ if (smtp_input) { if (smtp_reply == NULL) { -#ifndef WITH_CONTENT_SCAN - smtp_printf("250 OK id=%s\r\n", message_id); -#else - if (fake_reject) - smtp_respond(550,TRUE,fake_reject_text); - else - smtp_printf("250 OK id=%s\r\n", message_id); -#endif + if (fake_reject) + smtp_respond(550,TRUE,fake_reject_text); + else + smtp_printf("250 OK id=%s\r\n", message_id); if (host_checking) fprintf(stdout, "\n**** SMTP testing: that is not a real message id!\n\n"); } -#ifndef WITH_CONTENT_SCAN - else if (smtp_reply[0] != 0) smtp_printf("%.1024s\r\n", smtp_reply); -#else else if (smtp_reply[0] != 0) { - if (fake_reject && (smtp_reply[0] == '2')) - smtp_respond(550,TRUE,fake_reject_text); - else - smtp_printf("%.1024s\r\n", smtp_reply); - }; -#endif + if (fake_reject && (smtp_reply[0] == '2')) + smtp_respond(550,TRUE,fake_reject_text); + else + smtp_printf("%.1024s\r\n", smtp_reply); + } } /* For batched SMTP, generate an error message on failure, and do diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index b5bef64cd..905f08cb2 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/smtp_in.c,v 1.6 2004/12/16 15:11:47 tom Exp $ */ +/* $Cambridge: exim/src/src/smtp_in.c,v 1.7 2004/12/29 16:00:58 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -805,8 +805,8 @@ message_size = -1; acl_warn_headers = NULL; queue_only_policy = FALSE; deliver_freeze = FALSE; /* Can be set by ACL */ -#ifdef WITH_CONTENT_SCAN fake_reject = FALSE; /* Can be set by ACL */ +#ifdef WITH_CONTENT_SCAN no_mbox_unspool = FALSE; /* Can be set by ACL */ #endif submission_mode = FALSE; /* Can be set by ACL */ |