rpms/logwatch/F-9 logwatch-7.3.6-postfix4.patch,1.1,1.2

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3173

Modified Files:
	logwatch-7.3.6-postfix4.patch 
Log Message:
- parse another bunch of postfix logs(#467378)



logwatch-7.3.6-postfix4.patch:

Index: logwatch-7.3.6-postfix4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-9/logwatch-7.3.6-postfix4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.3.6-postfix4.patch	24 Oct 2008 08:21:21 -0000	1.1
+++ logwatch-7.3.6-postfix4.patch	29 Oct 2008 12:27:37 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up logwatch-7.3.6/scripts/services/postfix.pom logwatch-7.3.6/scripts/services/postfix
---- logwatch-7.3.6/scripts/services/postfix.pom	2008-10-17 09:29:36.000000000 +0200
-+++ logwatch-7.3.6/scripts/services/postfix	2008-10-24 10:13:53.000000000 +0200
+--- logwatch-7.3.6/scripts/services/postfix.pom	2008-10-29 13:23:46.000000000 +0100
++++ logwatch-7.3.6/scripts/services/postfix	2008-10-29 13:23:46.000000000 +0100
 @@ -769,8 +769,9 @@ while ( <> ) {
        #TD disconnect from mail.example.com[2001:dead:beef::1]
        $Totals{'Disconnection'}++;
@@ -12,3 +12,24 @@
        #TD connect to example.org[10.0.0.1]: Connection refused (port 25)
        #TD connect to mail.sample.com[10.0.0.1]: No route to host (port 25)
        #TD connect to sample.net[192.168.0.1]: read timeout (port 25)
+@@ -1521,6 +1522,11 @@ while ( <> ) {
+          $Totals{'RejectMilter'}++;
+          #$Counts{'RejectMilter'}{$cmd}{formathost($hostip,$host)}{$reason}{$p3}++;
+          $Counts{'RejectMilter'}{$cmd}{formathost($hostip,$host)}{$reason}++;
++         
++     } elsif ( ($host,$hostip,$reason) = ($p1 =~ /host ([^ ]*)\[([^ ]*)\] refused to talk to me: [0-9]* .*: Connection refused. (.*)/)) {   
++       # TD  host mx10.hanmail.net[211.43.197.142] refused to talk to me: 554 5.7.1 CCRX 80.95.96.6: Connection refused. Your IP address is blocked(anti-spa
++        $Totals{'ConnectToFailure'}++; 
++        $Counts{'ConnectToFailure'}{$reason}{formathost($hostip,$host)}++; 
+ 
+       } else {
+          # keep this as the last condition in this else clause
+@@ -1571,7 +1577,7 @@ while ( <> ) {
+    }
+ 
+    # see also TimeoutInbound in $re_QID section
+-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
++   elsif ( ($reason,$size,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
+       #TD timeout after DATA (0 bytes) from unknown[85.102.182.31]
+       #TD timeout after RSET from example.com[192.168.0.1]
+       $Totals{'TimeoutInbound'}++;