ph10 2005/11/14 16:09:54 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src acl.c globals.c macros.h
Log:
Added acl_warn_skipped log selector (default on).
Revision Changes Path
1.260 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.51 +1 -1 exim/exim-src/src/acl.c
1.41 +1 -0 exim/exim-src/src/globals.c
1.20 +23 -21 exim/exim-src/src/macros.h
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- ChangeLog 14 Nov 2005 15:28:48 -0000 1.259
+++ ChangeLog 14 Nov 2005 16:09:54 -0000 1.260
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.259 2005/11/14 15:28:48 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.260 2005/11/14 16:09:54 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -119,6 +119,8 @@
PH/11 Added "${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
to the default Received: header definition.
+
+PH/12 Added log selector acl_warn_skipped (default on).
Exim version 4.54
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- acl.c 3 Oct 2005 13:25:33 -0000 1.50
+++ acl.c 14 Nov 2005 16:09:54 -0000 1.51
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.50 2005/10/03 13:25:33 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.51 2005/11/14 16:09:54 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3321,7 +3321,7 @@
case ACL_WARN:
if (cond == OK)
acl_warn(where, *user_msgptr, *log_msgptr);
- else if (cond == DEFER)
+ else if (cond == DEFER && (log_extra_selector & LX_acl_warn_skipped) != 0)
log_write(0, LOG_MAIN, "%s Warning: ACL \"warn\" statement skipped: "
"condition test deferred%s%s", host_and_ident(TRUE),
(*log_msgptr == NULL)? US"" : US": ",
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- globals.c 14 Nov 2005 15:28:48 -0000 1.40
+++ globals.c 14 Nov 2005 16:09:54 -0000 1.41
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.40 2005/11/14 15:28:48 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.41 2005/11/14 16:09:54 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -646,6 +646,7 @@
selectors was getting close to filling a 32-bit word. */
bit_table log_options[] = {
+ { US"acl_warn_skipped", LX_acl_warn_skipped },
{ US"address_rewrite", L_address_rewrite },
{ US"all", L_all },
{ US"all_parents", L_all_parents },
Index: macros.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/macros.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- macros.h 12 Sep 2005 13:39:31 -0000 1.19
+++ macros.h 14 Nov 2005 16:09:54 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/macros.h,v 1.19 2005/09/12 13:39:31 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/macros.h,v 1.20 2005/11/14 16:09:54 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -371,26 +371,27 @@
#define L_smtp_protocol_error 0x00004000
#define L_smtp_syntax_error 0x00008000
-#define LX_arguments 0x80000001
-#define LX_deliver_time 0x80000002
-#define LX_delivery_size 0x80000004
-#define LX_ident_timeout 0x80000008
-#define LX_incoming_interface 0x80000010
-#define LX_incoming_port 0x80000020
-#define LX_outgoing_port 0x80000040
-#define LX_queue_time 0x80000080
-#define LX_queue_time_overall 0x80000100
-#define LX_received_sender 0x80000200
-#define LX_received_recipients 0x80000400
-#define LX_rejected_header 0x80000800
-#define LX_return_path_on_delivery 0x80001000
-#define LX_sender_on_delivery 0x80002000
-#define LX_smtp_confirmation 0x80004000
-#define LX_subject 0x80008000
-#define LX_tls_certificate_verified 0x80010000
-#define LX_tls_cipher 0x80020000
-#define LX_tls_peerdn 0x80040000
-#define LX_unknown_in_list 0x80080000
+#define LX_acl_warn_skipped 0x80000001
+#define LX_arguments 0x80000002
+#define LX_deliver_time 0x80000004
+#define LX_delivery_size 0x80000008
+#define LX_ident_timeout 0x80000010
+#define LX_incoming_interface 0x80000020
+#define LX_incoming_port 0x80000040
+#define LX_outgoing_port 0x80000080
+#define LX_queue_time 0x80000100
+#define LX_queue_time_overall 0x80000200
+#define LX_received_sender 0x80000400
+#define LX_received_recipients 0x80000800
+#define LX_rejected_header 0x80001000
+#define LX_return_path_on_delivery 0x80002000
+#define LX_sender_on_delivery 0x80004000
+#define LX_smtp_confirmation 0x80008000
+#define LX_subject 0x80010000
+#define LX_tls_certificate_verified 0x80020000
+#define LX_tls_cipher 0x80040000
+#define LX_tls_peerdn 0x80080000
+#define LX_unknown_in_list 0x80100000
#define L_default (L_connection_reject | \
L_delay_delivery | \
@@ -403,7 +404,8 @@
L_size_reject | \
L_skip_delivery)
-#define LX_default ((LX_rejected_header | \
+#define LX_default ((LX_acl_warn_skipped | \
+ LX_rejected_header | \
LX_tls_cipher) & 0x7fffffff)
/* Private error numbers for delivery failures, set negative so as not
