|
|
@@ -1,27 +1,21 @@
|
|
|
This patch makes Pflogsumm working with the particular format
|
|
|
of the OSSP fsl based Postfix logfile.
|
|
|
|
|
|
---- pflogsumm.pl.orig Wed Feb 19 23:36:07 2003
|
|
|
-+++ pflogsumm.pl Wed Mar 5 10:34:11 2003
|
|
|
-@@ -470,7 +470,7 @@
|
|
|
- next if(defined($dateStr) && ! /^$dateStr/o);
|
|
|
+--- pflogsumm.pl.orig Tue Jun 17 17:59:57 2003
|
|
|
++++ pflogsumm.pl Tue Jun 24 11:41:59 2003
|
|
|
+
|
|
|
+@@ -498,8 +498,8 @@
|
|
|
s/: \[ID \d+\s+[^\]]+\] /: /o; # lose "[ID nnnnnn some.thing]" stuff
|
|
|
- unless((($msgMonStr, $msgDay, $msgTimeStr, $cmd, $qid) =
|
|
|
-- m#^(...)\s+(\d+)\s(..:..:..)\s\S+\s(?:vmailer|$syslogName)[-/]([^\[:]*).*?: ([^:]+)#o) == 5)
|
|
|
-+ m#^(...)\s+(\d+)\s(..:..:..)\s\S+\s+\S+\s(?:vmailer|$syslogName)[-/]([^\[:]*).*?: ([^:]+)#o) == 5)
|
|
|
+ my $logRmdr;
|
|
|
+ ($msgMonStr, $msgDay, $msgTimeStr, $logRmdr) = /^(...)\s+(\d+)\s(..:..:..)\s\S+\s(.+)$/o;
|
|
|
+- unless((($cmd, $qid) = $logRmdr =~ m#^(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
|
|
|
+- (($cmd, $qid) = $logRmdr =~ m#^((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
|
|
|
++ unless((($cmd, $qid) = $logRmdr =~ m#^<[a-z]+>\s+(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
|
|
|
++ (($cmd, $qid) = $logRmdr =~ m#^<[a-z]+>\s+((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
|
|
|
{
|
|
|
- unless((($msgMonStr, $msgDay, $msgTimeStr, $cmd, $qid) =
|
|
|
- m#^(...)\s+(\d+)\s(..:..:..)\s\S+\s(vmailer|$syslogName[^\[:]*).*?: ([^:]+)#o) == 5)
|
|
|
-@@ -581,7 +581,7 @@
|
|
|
- @{$connTime{$1}} =
|
|
|
- ($msgYr, $msgMon + 1, $msgDay, $msgHr, $msgMin, $msgSec);
|
|
|
- } elsif(/: disconnect from /o) {
|
|
|
-- my ($pid, $hostID) = /\/smtpd\[(\d+)\]: disconnect from (.+)$/o;
|
|
|
-+ my ($pid, $hostID) = /\/smtpd\[(\d+)\]: disconnect from (.+)$/o || next;
|
|
|
- if(exists($connTime{$pid})) {
|
|
|
- $hostID = gimme_domain($hostID);
|
|
|
- my($d, $h, $m, $s) = Delta_DHMS(@{$connTime{$pid}},
|
|
|
-@@ -1299,7 +1299,7 @@
|
|
|
+ #print UNPROCD "$_";
|
|
|
+ next;
|
|
|
+@@ -1324,7 +1324,7 @@
|
|
|
}
|
|
|
my ($t_mday, $t_mon) = (localtime($time))[3,4];
|
|
|
|
