Some updates to postfix.

5 files changed, 7 insertions, 9 deletions

diff --git a/logcheck/ignore.d.server/local b/logcheck/ignore.d.server/local
index a62c894..b5d411a 100644
--- a/logcheck/ignore.d.server/local
+++ b/logcheck/ignore.d.server/local
@@ -221,7 +221,7 @@ postfix/smtp\[[0-9]+\]: warning: bad size limit "truncates" in EHLO reply from [
 postfix/smtp\[[0-9]+\]: warning: host [^[:space:]]+\[[\.0-9]+\] (greeted me|replied to HELO/EHLO) with my own hostname [^[:space:]]+$
 postfix/smtp\[[0-9]+\]: warning: no MX host for [^[:space:]]+ has a valid A record$
 postfix/smtpd?\[[0-9]+\]: (Unv|V)erified: subject_CN=[^,]+, issuer=[^,]+$
-postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSLv3|TLSv1) with cipher [^[:space:]]+ \([0-9/]+ bits\)$
+postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSL|TLS)v[123] with cipher [^[:space:]]+ \([0-9/]+ bits\)$
 postfix/smtpd?\[[0-9]+\]: fingerprint=[0-9A-F:]+$
 postfix/smtpd?\[[0-9]+\]: setting up TLS connection (from|to) [^[:space:]]+\[[\.0-9]+\]$
 postfix/smtpd?\[[0-9]+\]: verify error:num=18:self signed certificate$
diff --git a/logcheck/ignore.d.server/postfix b/logcheck/ignore.d.server/postfix
index b577ded..af1916e 100644
--- a/logcheck/ignore.d.server/postfix
+++ b/logcheck/ignore.d.server/postfix
@@ -14,7 +14,7 @@ postfix/smtp\[[0-9]+\]: warning: bad size limit "truncates" in EHLO reply from [
 postfix/smtp\[[0-9]+\]: warning: host [^[:space:]]+\[[\.0-9]+\] (greeted me|replied to HELO/EHLO) with my own hostname [^[:space:]]+$
 postfix/smtp\[[0-9]+\]: warning: no MX host for [^[:space:]]+ has a valid A record$
 postfix/smtpd?\[[0-9]+\]: (Unv|V)erified: subject_CN=[^,]+, issuer=[^,]+$
-postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSLv3|TLSv1) with cipher [^[:space:]]+ \([0-9/]+ bits\)$
+postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSL|TLS)v[123] with cipher [^[:space:]]+ \([0-9/]+ bits\)$
 postfix/smtpd?\[[0-9]+\]: fingerprint=[0-9A-F:]+$
 postfix/smtpd?\[[0-9]+\]: setting up TLS connection (from|to) [^[:space:]]+\[[\.0-9]+\]$
 postfix/smtpd?\[[0-9]+\]: verify error:num=18:self signed certificate$
diff --git a/logcheck/ignore.d.workstation/local b/logcheck/ignore.d.workstation/local
index 9ab45d6..28d293b 100644
--- a/logcheck/ignore.d.workstation/local
+++ b/logcheck/ignore.d.workstation/local
@@ -221,7 +221,7 @@ postfix/smtp\[[0-9]+\]: warning: bad size limit "truncates" in EHLO reply from [
 postfix/smtp\[[0-9]+\]: warning: host [^[:space:]]+\[[\.0-9]+\] (greeted me|replied to HELO/EHLO) with my own hostname [^[:space:]]+$
 postfix/smtp\[[0-9]+\]: warning: no MX host for [^[:space:]]+ has a valid A record$
 postfix/smtpd?\[[0-9]+\]: (Unv|V)erified: subject_CN=[^,]+, issuer=[^,]+$
-postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSLv3|TLSv1) with cipher [^[:space:]]+ \([0-9/]+ bits\)$
+postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSL|TLS)v[123] with cipher [^[:space:]]+ \([0-9/]+ bits\)$
 postfix/smtpd?\[[0-9]+\]: fingerprint=[0-9A-F:]+$
 postfix/smtpd?\[[0-9]+\]: setting up TLS connection (from|to) [^[:space:]]+\[[\.0-9]+\]$
 postfix/smtpd?\[[0-9]+\]: verify error:num=18:self signed certificate$
diff --git a/logcheck/violations.ignore.d/local b/logcheck/violations.ignore.d/local
index aad48cf..7c07283 100644
--- a/logcheck/violations.ignore.d/local
+++ b/logcheck/violations.ignore.d/local
@@ -43,15 +43,14 @@ postfix/local\[[0-9]+\]: warning: reject: ETRN [^[:space:]]+\.\.\. from [^[:spac
 postfix/local\[[0-9]+\]: warning: unable to create lock file /var/mail/[[:alnum:]]+\.lock: Permission denied$
 postfix/nqmgr\[[0-9]+\]: [A-Z0-9]+: from=<[^[:space:]>]+>, size=[0-9]+, nrcpt=[0-9]+ \(queue active\)$
 postfix/smtp\[[0-9]+\]: Peer verification: CommonName in certificate does not match: [^!]+ != [^[:space:]]+$
+postfix/smtp\[[0-9]+\]: [A-Z0-9]+: to=<[^>,]*>(, orig_to=<[^>,]>*)?, relay=[^[:space:]\[]+\[[\.0-9]+\], delay=[0-9]+, status=(bounced|deferred) \([^\(\)]+(\([^\(\)]*)?\)+( proto=E?SMTP helo=<[^[:space:]>]+>)?$
 postfix/smtp\[[0-9]+\]: connect to [^[:space:]\[]+\[[\.0-9]+\]: (Connection refused|server refused mail service) \(port 25\)$
 postfix/smtpd\[[0-9]+\]: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: 452 Insufficient system storage; from=<[^[:space:]>]+> to=<[^[:space:]>]+>$
 postfix/smtpd\[[0-9]+\]: warning: [^[:space:]\[]+\[[\.0-9]+\]: hostname [\.[:alnum:]-]+ verification failed: Host name has no address$
 # These are only for postfix << 2.0:
-postfix/smtp\[[0-9]+\]: [A-Z0-9]+: to=<[^>,]*>, relay=[^[:space:]\[]+\[[\.0-9]+\], delay=[0-9]+, status=(bounced|deferred) \([^\)]+\)+$
 postfix/smtpd\[[0-9]+\]: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: [45][0-9]{2} [^;]+; from=<[^[:space:]>]+> to=<[^[:space:]>]+>$
 # These are only for postfix >= 2.0:
-postfix/smtp\[[0-9]+\]: [A-Z0-9]+: to=<[^>,]*>, relay=[^[:space:]\[]+\[[\.0-9]+\], delay=[0-9]+, status=(bounced|deferred) \([^\)]+\)+ proto=E?SMTP helo=<[^[:space:]>]+>$
-postfix/smtpd\[[0-9]+\]: [A-Z0-9]+: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: [45][0-9]{2} [^;]+; from=<[^[:space:]>]+> to=<[^[:space:]>]+> proto=E?SMTP helo=<[^[:space:]>]+>$
+postfix/smtpd\[[0-9]+\]: [A-Z0-9]+: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: [45][0-9]{2} [^;]+; from=<[^[:space:]>]+>( to=<[^[:space:]>]+>)? proto=E?SMTP helo=<[^[:space:]>]+>$
 ### violations.ignore.d/proftpd
 proftpd\[[0-9]+\]: [^[:space:]]+ \([^[:space:]\[]+\[[\.0-9]+\]\) - USER anonymous \(Login failed\): Can't find user\.$
 ### violations.ignore.d/samba
diff --git a/logcheck/violations.ignore.d/postfix b/logcheck/violations.ignore.d/postfix
index 7a30d48..8187ef7 100644
--- a/logcheck/violations.ignore.d/postfix
+++ b/logcheck/violations.ignore.d/postfix
@@ -4,12 +4,11 @@ postfix/local\[[0-9]+\]: warning: reject: ETRN [^[:space:]]+\.\.\. from [^[:spac
 postfix/local\[[0-9]+\]: warning: unable to create lock file /var/mail/[[:alnum:]]+\.lock: Permission denied$
 postfix/nqmgr\[[0-9]+\]: [A-Z0-9]+: from=<[^[:space:]>]+>, size=[0-9]+, nrcpt=[0-9]+ \(queue active\)$
 postfix/smtp\[[0-9]+\]: Peer verification: CommonName in certificate does not match: [^!]+ != [^[:space:]]+$
+postfix/smtp\[[0-9]+\]: [A-Z0-9]+: to=<[^>,]*>(, orig_to=<[^>,]>*)?, relay=[^[:space:]\[]+\[[\.0-9]+\], delay=[0-9]+, status=(bounced|deferred) \([^\(\)]+(\([^\(\)]*)?\)+( proto=E?SMTP helo=<[^[:space:]>]+>)?$
 postfix/smtp\[[0-9]+\]: connect to [^[:space:]\[]+\[[\.0-9]+\]: (Connection refused|server refused mail service) \(port 25\)$
 postfix/smtpd\[[0-9]+\]: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: 452 Insufficient system storage; from=<[^[:space:]>]+> to=<[^[:space:]>]+>$
 postfix/smtpd\[[0-9]+\]: warning: [^[:space:]\[]+\[[\.0-9]+\]: hostname [\.[:alnum:]-]+ verification failed: Host name has no address$
 # These are only for postfix << 2.0:
-postfix/smtp\[[0-9]+\]: [A-Z0-9]+: to=<[^>,]*>, relay=[^[:space:]\[]+\[[\.0-9]+\], delay=[0-9]+, status=(bounced|deferred) \([^\)]+\)+$
 postfix/smtpd\[[0-9]+\]: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: [45][0-9]{2} [^;]+; from=<[^[:space:]>]+> to=<[^[:space:]>]+>$
 # These are only for postfix >= 2.0:
-postfix/smtp\[[0-9]+\]: [A-Z0-9]+: to=<[^>,]*>, relay=[^[:space:]\[]+\[[\.0-9]+\], delay=[0-9]+, status=(bounced|deferred) \([^\)]+\)+ proto=E?SMTP helo=<[^[:space:]>]+>$
-postfix/smtpd\[[0-9]+\]: [A-Z0-9]+: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: [45][0-9]{2} [^;]+; from=<[^[:space:]>]+> to=<[^[:space:]>]+> proto=E?SMTP helo=<[^[:space:]>]+>$
+postfix/smtpd\[[0-9]+\]: [A-Z0-9]+: reject: RCPT from [^[:space:]\[]+\[[\.0-9]+\]: [45][0-9]{2} [^;]+; from=<[^[:space:]>]+>( to=<[^[:space:]>]+>)? proto=E?SMTP helo=<[^[:space:]>]+>$