------- You are receiving this mail because: ------- You are on the CC list for the bug.
http://bugs.exim.org/show_bug.cgi?id=943 Git Commit <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #3 from Git Commit <[email protected]> 2011-02-06 20:17:06 --- Git commit: http://git.exim.org/exim.git/commitdiff/bd4c97599a4d321677cdf677275022f6660930f9 commit bd4c97599a4d321677cdf677275022f6660930f9 Author: Nigel Metheringham <[email protected]> AuthorDate: Sun Feb 6 19:20:06 2011 +0000 Commit: Nigel Metheringham <[email protected]> CommitDate: Sun Feb 6 19:20:06 2011 +0000 Fix exiqgrep issue where malformed lines not parsed Fixes bug 943 Lightly tested, but not with report error condition, would like reporter to check this fix on their system. --- doc/doc-txt/ChangeLog | 3 +++ src/src/exiqgrep.src | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 083870a..135213b 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -35,6 +35,9 @@ NM/03 Allow underscore in dnslist lookups PP/04 Bugzilla 230: Support TLS-enabled LDAP (in addition to ldaps). Code patches from Adam Ciarcinski of NetBSD. +NM/04 Fixed exiqgrep to cope with mailq missing size issue + Fixes bug 943. + Exim version 4.74 ----------------- diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src index 9abaab7..fd8b5a6 100644 --- a/src/src/exiqgrep.src +++ b/src/src/exiqgrep.src @@ -88,7 +88,7 @@ sub collect() { chomp(); my $line = $_; #Should be 1st line of record, if not error. - if ($line =~ /^\s*(\w+)\s+(\S+)\s+(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) { + if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) { my $msg = $3; $id{$msg}{age} = $1; $id{$msg}{size} = $2; -- Configure bugmail: http://bugs.exim.org/userprefs.cgi?tab=email -- ## List details at http://lists.exim.org/mailman/listinfo/exim-dev Exim details at http://www.exim.org/ ##
