Index: mailgraph-1.14/mailgraph.pl =================================================================== --- mailgraph-1.14.orig/mailgraph.pl 2012-02-25 21:15:26.000000000 +0100 +++ mailgraph-1.14/mailgraph.pl 2012-02-25 21:16:33.000000000 +0100 @@ -596,7 +596,7 @@ } } elsif($prog eq 'smtpd') { - if($text =~ /^[0-9A-Z]+: client=(\S+)/) { + if($text =~ /^[0-9A-Za-z]+: client=(\S+)/) { my $client = $1; return if $opt{'ignore-localhost'} and $client =~ /\[127\.0\.0\.1\]$/; @@ -604,16 +604,16 @@ $client =~ /$opt{'ignore-host'}/oi; event($time, 'received'); } - elsif($opt{'virbl-is-virus'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using virbl.dnsbl.bit.nl/) { + elsif($opt{'virbl-is-virus'} and $text =~ /^(?:[0-9A-Za-z]+: |NOQUEUE: )?reject: .*: 554.* blocked using virbl.dnsbl.bit.nl/) { event($time, 'virus'); } - elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) { + elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[0-9A-Za-z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) { event($time, 'spam'); } - elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) { + elsif($text =~ /^(?:[0-9A-Za-z]+: |NOQUEUE: )?reject: /) { event($time, 'rejected'); } - elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?milter-reject: /) { + elsif($text =~ /^(?:[0-9A-Za-z]+: |NOQUEUE: )?milter-reject: /) { if($text =~ /Blocked by SpamAssassin/) { event($time, 'spam'); } @@ -628,7 +628,7 @@ } } elsif($prog eq 'cleanup') { - if($text =~ /^[0-9A-Z]+: (?:reject|discard): /) { + if($text =~ /^[0-9A-Za-z]+: (?:reject|discard): /) { event($time, 'rejected'); } }