summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-07-13 14:46:05 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-07-13 14:46:05 +0000
commit5dff5817bb92191e4fd5f9d36fe20b1fec6c9969 (patch)
treee4fe0c000eae3f0c9db8952c215799f008701155 /src
parenta5bd321b2f16ff323e3e268d59606e89b747a901 (diff)
Add a check for Auto-Submitted to the default for
delay_warning_condition.
Diffstat (limited to 'src')
-rw-r--r--src/src/globals.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/src/globals.c b/src/src/globals.c
index 2a6aba592..e17eba728 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.c,v 1.55 2006/07/13 13:53:33 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.56 2006/07/13 14:46:05 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -449,7 +449,11 @@ bit_table debug_options[] = {
int debug_options_count = sizeof(debug_options)/sizeof(bit_table);
unsigned int debug_selector = 0;
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
-uschar *delay_warning_condition= US"${if match{$h_precedence:}{(?i)bulk|list|junk}{no}{yes}}";
+uschar *delay_warning_condition=
+ US"${if or {"
+ "{ match{$h_precedence:}{(?i)bulk|list|junk} }"
+ "{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }"
+ "} {no}{yes}}";
BOOL delivery_date_remove = TRUE;
uschar *deliver_address_data = NULL;
int deliver_datafile = -1;