summaryrefslogtreecommitdiffstats
path: root/pflogsumm_quickfix.txt
blob: 85a8719533e045a04cbdfff1b0ee150738449b6c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
These diffs for pflogsumm versions 1.1.1 and 1.1.3 work around a
change in the Postfix 2.9 default master.cf file.

That change made the logging from submission and smtps services easier
to distinguish, by changing postfix/smtpd into postfix/submission/smtpd
and postfix/smtps/smtpd, respectively.

Below are diffs for pflogsumm-1.1.1 and pflogsumm-1.1.3 (beta).
Choose one that fits your pflogsumm version.

====begin diff=====================
*** ./pflogsumm-1.1.1/pflogsumm.pl-	Fri Apr  6 10:06:37 2007
--- ./pflogsumm-1.1.1/pflogsumm.pl	Fri Jan 20 17:05:10 2012
***************
*** 542,548 ****
      my $logRmdr;
      next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
  	/^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
      {
  	#print UNPROCD "$_";
--- 542,548 ----
      my $logRmdr;
      next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
  	/^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)(?:/(?:smtps|submission))?/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
      {
  	#print UNPROCD "$_";
====end diff=====================

====begin diff=====================
*** ./pflogsumm-1.1.3/pflogsumm.pl-	Sat Mar 20 16:00:42 2010
--- ./pflogsumm-1.1.3/pflogsumm.pl	Fri Jan 20 17:02:37 2012
***************
*** 636,642 ****
  	--$msgMon;
      }
  
!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
      {
  	#print UNPROCD "$_";
--- 636,642 ----
  	--$msgMon;
      }
  
!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)(?:/(?:smtps|submission))?/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
      {
  	#print UNPROCD "$_";
====end diff=====================