ph10 2004/12/29 16:00:59 GMT
Modified files:
exim-src/src acl.c globals.c globals.h receive.c
smtp_in.c
Log:
Removed the WITH_CONTENT_SCAN conditionals from the fakereject feature of
Exiscan, since it doesn't really depend on content scanning.
Revision Changes Path
1.8 +0 -2 exim/exim-src/src/acl.c
1.12 +0 -2 exim/exim-src/src/globals.c
1.9 +0 -2 exim/exim-src/src/globals.h
1.8 +9 -17 exim/exim-src/src/receive.c
1.7 +1 -1 exim/exim-src/src/smtp_in.c
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- acl.c 17 Dec 2004 14:52:44 -0000 1.7
+++ acl.c 29 Dec 2004 16:00:58 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.7 2004/12/17 14:52:44 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
no_multiline_responses = TRUE;
break;
-#ifdef WITH_CONTENT_SCAN
case CONTROL_FAKEREJECT:
fake_reject = TRUE;
if (*p == '/')
@@ -1667,7 +1666,6 @@
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;
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- globals.c 22 Dec 2004 12:05:46 -0000 1.11
+++ globals.c 29 Dec 2004 16:00:58 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.11 2004/12/22 12:05:46 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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];
Index: globals.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- globals.h 16 Dec 2004 15:11:47 -0000 1.8
+++ globals.h 29 Dec 2004 16:00:58 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.h,v 1.8 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/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 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 */
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- receive.c 17 Dec 2004 14:52:44 -0000 1.7
+++ receive.c 29 Dec 2004 16:00:58 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.7 2004/12/17 14:52:44 ph10 Exp $ */
+/* $Cambridge: exim/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_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
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- smtp_in.c 16 Dec 2004 15:11:47 -0000 1.6
+++ smtp_in.c 29 Dec 2004 16:00:58 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.6 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/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 @@
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 */
