]> git.sven.stormbind.net Git - sven/pflogsumm.git/blob - debian/patches/milter-rejects
Add patch to count milter rejects provided by Matus Uhlar.
[sven/pflogsumm.git] / debian / patches / milter-rejects
1 Index: pflogsumm/pflogsumm.pl
2 ===================================================================
3 --- pflogsumm.orig/pflogsumm.pl
4 +++ pflogsumm/pflogsumm.pl
5 @@ -666,11 +666,11 @@ while(<>) {
6  
7      # regexp rejects happen in "cleanup"
8      if($cmd eq "cleanup" && (my($rejSubTyp, $rejReas, $rejRmdr) = $logRmdr =~
9 -       /\/cleanup\[\d+\]: .*?\b(reject|warning|hold|discard): (header|body) (.*)$/) == 3)
10 +       /\/cleanup\[\d+\]: .*?\b((?:milter-)reject|warning|hold|discard): (header|body|END-OF-MESSAGE) (.*)$/) == 3)
11      {
12         $rejRmdr =~ s/( from \S+?)?; from=<.*$// unless($opts{'verbMsgDetail'});
13         $rejRmdr = string_trimmer($rejRmdr, 64, $opts{'verbMsgDetail'});
14 -       if($rejSubTyp eq "reject") {
15 +       if($rejSubTyp eq "reject" or $rejSubTyp eq "milter-reject") {
16             ++$rejects{$cmd}{$rejReas}{$rejRmdr} unless($opts{'rejectDetail'} == 0);
17             ++$msgsRjctd;
18         } elsif($rejSubTyp eq "warning") {