Add { !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} } as another

"don't send" delay warning condition by default.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index d607ebdb149dbcecff2d4c786a9e9c79911e4430..365af8546485972fb1e3782240effce2a08cea85 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.384 2006/07/27 13:50:43 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.385 2006/07/28 11:39:11 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -93,16 +93,17 @@ PH/16 Recognize SMTP codes at the start of "message" in ACLs and after :fail:
       and :defer: in a redirect router. Add forbid_smtp_code to suppress the
       latter.
 
-PH/17 Added an extra condition to the default value of delay_warning_condition
+PH/17 Added extra conditions to the default value of delay_warning_condition
       so that it is now:
 
-        ${if or {
-            { match{$h_precedence:}{(?i)bulk|list|junk} }
-            { match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }
+        ${if or { \
+            { !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} } \
+            { match{$h_precedence:}{(?i)bulk|list|junk} } \
+            { match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} } \
             }{no}{yes}}
 
-      The Auto-Submitted: header is standardised, whereas I don't think
-      Precedence: ever was.
+      The Auto-Submitted: and various List- headers are standardised, whereas I
+      don't think Precedence: ever was.
 
 PH/18 Refactored debugging code in route_finduser() to show more information,
       in particular, the error code if getpwnam() issues one.

diff --git a/src/src/globals.c b/src/src/globals.c
index e17eba728ab90ea3c9a379c5e429b55beabe25af..84d564ab86e187396b9caee53bad937c1e0b5e78 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.c,v 1.56 2006/07/13 14:46:05 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.57 2006/07/28 11:39:11 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -451,6 +451,7 @@ unsigned int debug_selector    = 0;
 int     delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
 uschar *delay_warning_condition=
   US"${if or {"
+            "{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }"
             "{ match{$h_precedence:}{(?i)bulk|list|junk} }"
             "{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }"
             "} {no}{yes}}";

diff --git a/test/log/0098 b/test/log/0098
index 5e0c1da7f116906960b5f10da5114ff9c7600fa2..6cf0aa39c5575327b45cb317e938a3e7dc862608 100644 (file)
--- a/test/log/0098
+++ b/test/log/0098
@@ -103,3 +103,10 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbK-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer.
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbK-0005vi-00 removed by CALLER
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbL-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer.
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbL-0005vi-00 == defer@test.ex R=alias defer (-1): This address has been forced to defer.
+1999-03-02 09:44:33 End queue run: pid=pppp -qf

diff --git a/test/scripts/0000-Basic/0098 b/test/scripts/0000-Basic/0098
index 08a981f0933cc8f2e980e9775340d2cc59db5c8d..163d7274645c6b7ba9cc3e3b5b922d3d558916a9 100644 (file)
--- a/test/scripts/0000-Basic/0098
+++ b/test/scripts/0000-Basic/0098
@@ -58,4 +58,14 @@ Test message
 ****
 exim -DDEFAULTDWC -Tqt 20s/ -odi -qf
 ****
+# Remove the previous message
+exim -Mrm $msg1
+****
+# Check no warnings for List-id: (in default config)
+exim -odi defer@test.ex
+List-ID: Some data
+Test message
+****
+exim -DDEFAULTDWC -Tqt 20s/ -odi -qf
+****
 no_msglog_check

diff --git a/test/stdout/0098 b/test/stdout/0098
index 62e83a061a68b00748a24c66d2ac1d5ee5619b02..653ef80618ee700e34a45ed624b34d2550f57ea0 100644 (file)
--- a/test/stdout/0098
+++ b/test/stdout/0098
@@ -4,3 +4,4 @@ Message 10HmbB-0005vi-00 has been removed
 Message 10HmbD-0005vi-00 has been removed
 Message 10HmbI-0005vi-00 has been removed
 Message 10HmbJ-0005vi-00 has been removed
+Message 10HmbK-0005vi-00 has been removed