From 49826d124d8f6a6fa6c93e36f8d381dcf92a0e3e Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Mon, 14 Nov 2005 16:09:54 +0000 Subject: [PATCH] Added acl_warn_skipped log selector (default on). --- doc/doc-txt/ChangeLog | 4 +++- src/src/acl.c | 4 ++-- src/src/globals.c | 3 ++- src/src/macros.h | 46 ++++++++++++++++++++++--------------------- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 1f0b5dbd1..3693efbc1 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.259 2005/11/14 15:28:48 ph10 Exp $ +$Cambridge: 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 ------------------------------------------- @@ -120,6 +120,8 @@ PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to 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 ----------------- diff --git a/src/src/acl.c b/src/src/acl.c index ef8f06da6..2456141bd 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/acl.c,v 1.50 2005/10/03 13:25:33 ph10 Exp $ */ +/* $Cambridge: 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 @@ while (acl != NULL) 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": ", diff --git a/src/src/globals.c b/src/src/globals.c index 28026362b..127af7607 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.40 2005/11/14 15:28:48 ph10 Exp $ */ +/* $Cambridge: 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 @@ independently. This separation became necessary when the number of log 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 }, diff --git a/src/src/macros.h b/src/src/macros.h index 57ceceaac..97aaf05c2 100644 --- a/src/src/macros.h +++ b/src/src/macros.h @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/macros.h,v 1.19 2005/09/12 13:39:31 ph10 Exp $ */ +/* $Cambridge: 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 @@ set all the bits in a multi-word selector. */ #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 @@ set all the bits in a multi-word selector. */ 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 -- 2.30.2