Gitweb:
http://git.exim.org/exim.git/commitdiff/514ee161db1166e94b9ee889953f2e9774cee973
Commit: 514ee161db1166e94b9ee889953f2e9774cee973
Parent: 6f5a440ab65a2ec977db14ec69698068aed98935
Author: Steve Campbell <steve@???>
AuthorDate: Mon Jan 14 23:00:11 2013 +0000
Committer: Steve Campbell <steve@???>
CommitDate: Mon Jan 14 23:00:11 2013 +0000
Update eximstats to watch out for senders sending 'HELO [IpAddr]'
---
doc/doc-txt/ChangeLog | 2 ++
src/src/eximstats.src | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 924b0b8..3a1e39c 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -154,6 +154,8 @@ PP/15 Define SIOCGIFCONF_GIVES_ADDR for GNU Hurd.
Bug detection, analysis and fix by Samuel Thibault.
Bugzilla 1331, Debian bug #698092.
+SC/01 Update eximstats to watch out for senders sending 'HELO [IpAddr]'
+
Exim version 4.80.1
-------------------
diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index 4edb7e5..56721ed 100644
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -284,6 +284,8 @@
# 2007-09-20 V1.60 Heiko Schlittermann
# Fix for misinterpreted log lines
#
+# 2013-01-14 V1.61 Steve Campbell
+# Watch out for senders sending "HELO [IpAddr]"
#
#
# For documentation on the logfile format, see
@@ -582,7 +584,7 @@ use vars qw($WEEK $DAY $HOUR $MINUTE);
@days_per_month = (0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
$gig = 1024 * 1024 * 1024;
-$VERSION = '1.60';
+$VERSION = '1.61';
# How much space do we allow for the Hosts/Domains/Emails/Edomains column headers?
$COLUMN_WIDTHS = 8;
@@ -1924,7 +1926,8 @@ sub generate_parser {
# "H=Host (UnverifiedHost) [IpAddr]" or "H=(UnverifiedHost) [IpAddr]".
# We do 2 separate matches to keep the matches simple and fast.
# Host is local unless otherwise specified.
- $ip = (/\\bH=.*?(\\[[^]]+\\])/) ? $1
+ # Watch out for "H=([IpAddr])" in case they send "[IpAddr]" as their HELO!
+ $ip = (/\\bH=(?:|.*? )(\\[[^]]+\\])/) ? $1
# 2008-03-31 06:25:22 Connection from [213.246.33.217]:39456 refused: too many connections from that IP address // .hs
: (/Connection from (\[\S+\])/) ? $1
# 2008-03-31 06:52:40 SMTP call from mail.cacoshrf.com (ccsd02.ccsd.local) [69.24.118.229]:4511 dropped: too many nonmail commands (last was "RSET") // .hs
