47 lines
2.8 KiB
Diff
47 lines
2.8 KiB
Diff
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-09-15 13:13:29.000000000 +0200
|
|
+++ logwatch-7.3.6/scripts/services/postfix 2008-09-15 13:09:26.000000000 +0200
|
|
@@ -1530,8 +1530,9 @@ while ( <> ) {
|
|
# end of $re_QID section
|
|
|
|
# see also ConnectionLost in $re_QID section
|
|
- elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) from ([^[]*)\[($re_IP|unknown)\]$/o )) {
|
|
+ elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
|
|
unless ($hostip =~ /unknown/) {
|
|
+ #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]
|
|
#TD lost connection after CONNECT from mail.example.com[192.168.0.1]
|
|
$Totals{'ConnectionLost'}++;
|
|
$Counts{'ConnectionLost'}{"\u$reason"}{formathost($hostip,$host)}++;
|
|
@@ -1570,7 +1571,8 @@ while ( <> ) {
|
|
}
|
|
|
|
# see also TimeoutInbound in $re_QID section
|
|
- elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) from ([^[]*)\[($re_IP)\]$/o)) {
|
|
+ elsif ( ($reason,$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'}++;
|
|
$Counts{'TimeoutInbound'}{"\u$reason"}{formathost($hostip,$host)}++;
|
|
@@ -1593,7 +1595,8 @@ while ( <> ) {
|
|
|
|
### smtpd_tls_loglevel >= 1
|
|
# Server TLS messages
|
|
- elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
|
|
+ elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted|Anonymous) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
|
|
+ #DT Anonymous TLS connection established from fractal.kaosol.net[216.150.215.72]: TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)
|
|
#TD TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)
|
|
# Postfix 2.5+: status: Untrusted or Trusted
|
|
#TD Untrusted TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)
|
|
@@ -1625,6 +1628,11 @@ while ( <> ) {
|
|
$Totals{'TlsUnverified'}++;
|
|
$Counts{'TlsUnverified'}{$cert}++;
|
|
|
|
+ } elsif ( ($cert) = ($p1 =~ /: Untrusted: (subject_CN=.*)/)) {
|
|
+ #TD Untrusted: subject_CN=EXAMPLE-MAIL, issuer=EXAMPLE-MAIL,
|
|
+ $Totals{'TlsUnverified'}++;
|
|
+ $Counts{'TlsUnverified'}{$cert}++;
|
|
+
|
|
} elsif ( ($p1 =~ m/(lookup )?table ([^ ]+ )?has changed -- (restarting|exiting)$/)) {
|
|
#TD table hash:/etc/postfix/helo_checks has changed -- restarting
|
|
$Totals{'TableChanged'}++;
|