From: Nigel Metheringham <nigel@exim.org>
Date: Wed, 30 Nov 2011 15:46:48 +0000 (+0000)
Subject: eximstats DATA reject detection regexps improved. Fixes: #1093
X-Git-Tag: exim-4_80_RC1~97
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b322aac87b2d3e5a1cc4f3ebdee2fd81651bdd7c;p=exim.git

eximstats DATA reject detection regexps improved. Fixes: #1093
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2b46f71f7..bef890237 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -10,6 +10,11 @@ PP/01 Handle short writes when writing local log-files.
 
 NM/01 Bugzilla 949 - Documentation tweak
 
+NM/02 Bugzilla 1093 - eximstats DATA reject detection regexps
+      improved.
+
+
+
 
 Exim version 4.77
 -----------------
diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index 682ff016c..4edb7e54b 100644
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -2366,6 +2366,7 @@ sub generate_parser {
         # 2005-09-23 15:07:49 1EInHJ-0007Ex-Au H=(a.b.c) [10.0.0.1] F=<> rejected after DATA: This message contains a virus: (Eicar-Test-Signature) please scan your system.
         # 2005-10-06 10:50:07 1ENRS3-0000Nr-Kt => blackhole (DATA ACL discarded recipients): This message contains a virus: (Worm.SomeFool.P) please scan your system.
         / rejected after DATA: (.*)/ ||
+        / (rejected DATA: .*)/ ||
         /.DATA ACL discarded recipients.: (.*)/ ||
         /rejected after DATA: (unqualified address not permitted)/ ||
         /(VRFY rejected)/ ||