Package: logwatch
Version: 7.3.1-5
Severity: normal
Tags: patch
See-Also: #425642

--- /usr/share/logwatch/scripts/services/postfix        2006-12-04 
17:36:08.000000000 -0500
+++ /tmp/services_postfix.delay-reject  2007-05-30 10:56:34.000000000 -0400
@@ -279,7 +279,7 @@
       $UndeliverableMsg{$Reason}++;
    } elsif ( (undef,undef,undef,undef) = ($ThisLine =~ /^$re_MsgID: to=<([^ 
]*)>,( orig_to=<[^ ]*>,)? relay=([^ ]*), delay=\d+, status=deliverable 
\((.*)\)$/)) {
       $Deliverable++;
-   } elsif ( ($Host,$Sender,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ 
]*\[[^ ]*\]): $re_DSN <(.*)>: Sender address rejected: (.*);/)) {
+   } elsif ( ($Host,$Sender,$Reason) = ($ThisLine =~ /reject: (MAIL|RCPT) from 
([^ ]*\[[^ ]*\]): $re_DSN <(.*)>: Sender address rejected: (.*);/)) {
       $RejectSender{$Reason}{$Host}{$Sender}++;
       $RejectSenderHost{$Reason}{$Host}++;
       $RejectSenderReason{$Reason}++;
@@ -287,7 +287,7 @@
       $RejectClient{$Reason}{$Host}{$Sender}{$Recip}++;
       $RejectClientHost{$Reason}{$Host}++;
       $RejectClientReason{$Reason}++;
-   } elsif ( ($Host,$Sender,$Recip,$Helo) = ($ThisLine =~ /reject: RCPT from 
[^ ]*\[([^ ]*)\]: $re_DSN Client host rejected: cannot find your hostname, 
\[\d+\.\d+\.\d+\.\d+\]; from=<(.*?)> to=<(.*?)> proto=\S+ helo=<(.*)>/)) {
+   } elsif ( ($Host,$Sender,$Recip,$Helo) = ($ThisLine =~ /reject: 
(CONNECT|RCPT) from [^ ]*\[([^ ]*)\]: $re_DSN Client host rejected: cannot find 
your hostname, \[\d+\.\d+\.\d+\.\d+\];( from=<(.*?)> to=<(.*?)>)? proto=\S+( 
helo=<(.*)>)?/)) {
       $RejectUnknownClient{$Host}{$Helo}{$Sender}{$Recip}++;
       $RejectUnknownClientHost{"$Host  helo=<$Helo>"}++;
       $RejectUnknownClients++;
@@ -300,7 +300,7 @@
       $Temp = "$Host : $Reason";
       $RejectRBL{$Site}{$Temp}++;
       $RejectedRBL++;
-   } elsif ( ($Host,$Site) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ 
]*\]): $re_DSN Service unavailable; (?:Sender address |Client host )?\[[^ ]*\] 
blocked using ([^ ]*);/)) {
+   } elsif ( ($Host,$Site) = ($ThisLine =~ /reject: (CONNECT|RCPT) from ([^ 
]*\[[^ ]*\]): $re_DSN Service unavailable; (?:Sender address |Client host 
)?\[[^ ]*\] blocked using ([^ ]*);/)) {
       $RejectRBL{$Site}{$Host}++;
       $RejectedRBL++;
    } elsif ( ($Host,$Site,$Reason) = ($ThisLine =~ /warning: ([^ ]*): RBL 
lookup error: Name service error for \d+\.\d+\.\d+\.\d+\.([^ ]*): (.*)$/)) {
@@ -321,7 +321,7 @@
       $HeloError{$Error}{$Host}++;
    } elsif ( ($Host,$Error) = ($ThisLine =~ /warning: host ([^ ]*\[[^ ]*\]) 
(replied to HELO\/EHLO with my own hostname [^ ]*)$/)) {
       $HeloError{$Error}{$Host}++;
-   } elsif ( ($Host,$Error) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ 
]*\]): $re_DSN <.*>: (Helo command rejected: .*);/)) {
+   } elsif ( ($Host,$Error) = ($ThisLine =~ /reject: (HELO|RCPT) from ([^ 
]*\[[^ ]*\]): $re_DSN <.*>: (Helo command rejected: .*);/)) {
       $HeloError{$Error}{$Host}++;
    } elsif ( ($Error,$Host) = ($ThisLine =~ /(bad size limit "\([^ ]*\)" in 
EHLO reply) from ([^ ]*\[[^ ]*\])$/)) {
       $HeloError{$Error}{$Host}++;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to