ph10 2005/01/27 15:57:52 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src receive.c
exim-test-orig/AutoTest/confs 483
exim-test-orig/AutoTest/log 483
exim-test-orig/AutoTest/scripts 483
exim-test-orig/AutoTest/stdout 483
Log:
log_message on a "discard" verb was not working for the DATA or non-SMTP
ACLs.
Revision Changes Path
1.77 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.10 +5 -1 exim/exim-src/src/receive.c
1.2 +5 -1 exim/exim-test-orig/AutoTest/confs/483
1.2 +6 -0 exim/exim-test-orig/AutoTest/log/483
1.2 +8 -0 exim/exim-test-orig/AutoTest/scripts/483
1.2 +4 -0 exim/exim-test-orig/AutoTest/stdout/483
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 27 Jan 2005 15:00:39 -0000 1.76
+++ ChangeLog 27 Jan 2005 15:57:51 -0000 1.77
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.76 2005/01/27 15:00:39 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.77 2005/01/27 15:57:51 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -360,6 +360,10 @@
76. Arrange for output from Perl's "warn" command to be written to Exim's main
log by default. The user can override this with suitable Perl magic.
+
+77. The use of log_message on a "discard" ACL verb, which is supposed to add to
+ the log message when discard triggers, was not working for the DATA ACL or
+ for the non-SMTP ACL.
----------------------------------------------------
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- receive.c 4 Jan 2005 10:00:42 -0000 1.9
+++ receive.c 27 Jan 2005 15:57:51 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.9 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/receive.c,v 1.10 2005/01/27 15:57:51 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1115,6 +1115,7 @@
BOOL resents_exist = FALSE;
uschar *resent_prefix = US"";
uschar *blackholed_by = NULL;
+uschar *blackhole_log_msg = US"";
flock_t lock_data;
error_block *bad_addresses = NULL;
@@ -2869,6 +2870,8 @@
{
recipients_count = 0;
blackholed_by = US"DATA ACL";
+ if (log_msg != NULL)
+ blackhole_log_msg = string_sprintf(": %s", log_msg);
}
else if (rc != OK)
{
@@ -2896,6 +2899,7 @@
{
recipients_count = 0;
blackholed_by = US"non-SMTP ACL";
+ if (log_msg != NULL) blackhole_log_msg = string_sprintf(": %s", log_msg);
}
else if (rc != OK)
{
@@ -3429,7 +3433,7 @@
uschar *detail = (local_scan_data != NULL)?
string_printing(local_scan_data) :
string_sprintf("(%s discarded recipients)", blackholed_by);
- log_write(0, LOG_MAIN, "=> blackhole %s", detail);
+ log_write(0, LOG_MAIN, "=> blackhole %s%s", detail, blackhole_log_msg);
log_write(0, LOG_MAIN, "Completed");
message_id[0] = 0;
}
Index: 483
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/483,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 483 8 Oct 2004 14:49:16 -0000 1.1
+++ 483 27 Jan 2005 15:57:51 -0000 1.2
@@ -42,12 +42,16 @@
nested_rcpt:
accept acl = helo
-
+
data:
+ discard condition = ${if match{$recipients}{data_message_discard}}
+ log_message = discard message 3
discard condition = $h_discard:
accept
notsmtp:
+ discard condition = ${if match{$recipients}{data_message_discard}}
+ log_message = discard message 4
discard condition = $h_discard:
accept
Index: 483
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/483,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 483 8 Oct 2004 14:49:31 -0000 1.1
+++ 483 27 Jan 2005 15:57:51 -0000 1.2
@@ -18,3 +18,9 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=266 for a@b
1999-03-02 09:44:33 10HmbB-0005vi-00 => blackhole (DATA ACL discarded recipients)
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=264 for data_message_discard@b
+1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (DATA ACL discarded recipients): discard message 3
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=259 for data_message_discard@y
+1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (non-SMTP ACL discarded recipients): discard message 4
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
Index: 483
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/483,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 483 8 Oct 2004 14:49:53 -0000 1.1
+++ 483 27 Jan 2005 15:57:52 -0000 1.2
@@ -36,6 +36,14 @@
Testing
.
+mail from:<ok@???>
+rcpt to:<data_message_discard@b>
+data
+.
quit
+****
+1
+exim data_message_discard@y
+.
****
no_msglog_check
Index: 483
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/483,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 483 8 Oct 2004 14:50:14 -0000 1.1
+++ 483 27 Jan 2005 15:57:52 -0000 1.2
@@ -21,4 +21,8 @@
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmbB-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
221 mail.test.ex closing connection
