xref: /netbsd-src/external/ibm-public/postfix/dist/pflogsumm_quickfix.txt (revision a30b880ed60a24c405edba78187a04247f4d9d33)
1These diffs for pflogsumm versions 1.1.1 and 1.1.3 work around a
2change in the Postfix 2.9 default master.cf file.
3
4That change made the logging from submission and smtps services easier
5to distinguish, by changing postfix/smtpd into postfix/submission/smtpd
6and postfix/smtps/smtpd, respectively.
7
8Below are diffs for pflogsumm-1.1.1 and pflogsumm-1.1.3 (beta).
9Choose one that fits your pflogsumm version.
10
11====begin diff=====================
12*** ./pflogsumm-1.1.1/pflogsumm.pl-	Fri Apr  6 10:06:37 2007
13--- ./pflogsumm-1.1.1/pflogsumm.pl	Fri Jan 20 17:05:10 2012
14***************
15*** 542,548 ****
16      my $logRmdr;
17      next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
18  	/^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
19!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
20             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
21      {
22  	#print UNPROCD "$_";
23--- 542,548 ----
24      my $logRmdr;
25      next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
26  	/^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
27!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)(?:/(?:smtps|submission))?/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
28             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
29      {
30  	#print UNPROCD "$_";
31====end diff=====================
32
33====begin diff=====================
34*** ./pflogsumm-1.1.3/pflogsumm.pl-	Sat Mar 20 16:00:42 2010
35--- ./pflogsumm-1.1.3/pflogsumm.pl	Fri Jan 20 17:02:37 2012
36***************
37*** 636,642 ****
38  	--$msgMon;
39      }
40
41!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
42             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
43      {
44  	#print UNPROCD "$_";
45--- 636,642 ----
46  	--$msgMon;
47      }
48
49!     unless((($cmd, $qid) = $logRmdr =~ m#^(?:postfix|$syslogName)(?:/(?:smtps|submission))?/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
50             (($cmd, $qid) = $logRmdr =~ m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
51      {
52  	#print UNPROCD "$_";
53====end diff=====================
54