Misc cleanup...

6 files changed, 11 insertions, 8 deletions

diff --git a/logcheck/ignore.d.server/dhcp.changes b/logcheck/ignore.d.server/dhcp.changes
index 35c0615..6b32ed5 100644
--- a/logcheck/ignore.d.server/dhcp.changes
+++ b/logcheck/ignore.d.server/dhcp.changes
@@ -1,10 +1,10 @@
 # NB: dhcp3 entries are in dhcp3-common
 dhcpd-2.2.x: Abandoning IP address [\.0-9]+: (declined\.|pinged before offer) $
 dhcpd-2.2.x: BOOTREPLY for [\.0-9]+ to [^[:space:]]+ ([0-9a-f:]+) via eth[0-9]+ $
-dhcpd-2.2.x: BOOTREQUEST from [0-9a-f:]+ $
+dhcpd-2.2.x: BOOTREQUEST from [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCP(ACK|NAK|OFFER) on [\.0-9]+ to [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCPDISCOVER from .* via eth[0-9]+ $
-dhcpd-2.2.x: DHCPINFORM from [\.0-9]+ $
+dhcpd-2.2.x: DHCPINFORM from [\.0-9]+$
 dhcpd-2.2.x: DHCPDECLINE on [\.0-9]+ from [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCPRELEASE of [\.0-9]+ from [0-9a-f:]+ via eth[0-9]+ \((not )?found\) $
 dhcpd-2.2.x: DHCPREQUEST for [\.0-9]+ from [0-9a-f:]+( \([^[:space:]]+\))? via eth[0-9]+ $
diff --git a/logcheck/ignore.d.server/local b/logcheck/ignore.d.server/local
index 7999146..3f94c87 100644
--- a/logcheck/ignore.d.server/local
+++ b/logcheck/ignore.d.server/local
@@ -75,10 +75,10 @@ dhclient(-2.2.x)?: irda0: unknown hardware address type 783$
 # NB: dhcp3 entries are in dhcp3-common
 dhcpd-2.2.x: Abandoning IP address [\.0-9]+: (declined\.|pinged before offer) $
 dhcpd-2.2.x: BOOTREPLY for [\.0-9]+ to [^[:space:]]+ ([0-9a-f:]+) via eth[0-9]+ $
-dhcpd-2.2.x: BOOTREQUEST from [0-9a-f:]+ $
+dhcpd-2.2.x: BOOTREQUEST from [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCP(ACK|NAK|OFFER) on [\.0-9]+ to [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCPDISCOVER from .* via eth[0-9]+ $
-dhcpd-2.2.x: DHCPINFORM from [\.0-9]+ $
+dhcpd-2.2.x: DHCPINFORM from [\.0-9]+$
 dhcpd-2.2.x: DHCPDECLINE on [\.0-9]+ from [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCPRELEASE of [\.0-9]+ from [0-9a-f:]+ via eth[0-9]+ \((not )?found\) $
 dhcpd-2.2.x: DHCPREQUEST for [\.0-9]+ from [0-9a-f:]+( \([^[:space:]]+\))? via eth[0-9]+ $
@@ -187,6 +187,7 @@ netsaint: NetSaint [\.0-9]+ starting\.\.\. \(PID=[0-9]+\) $
 ### ignore.d.server/nfs-kernel-server
 mountd\[[0-9]+\]: NFS mount of /[^[:space:]]+ attempted from [\.0-9]+$
 mountd\[[0-9]+\]: /[^[:space:]]+ has been mounted by [\.0-9]+$
+rpc\.mountd: authenticated unmount request from [\.0-9]+:[0-9]+ for /[^[:space:]]* \(/[^[:space:]\)]*\) $
 ### ignore.d.server/non-debian
 # These entries are for syslogd open for remote hosts
 # (and advertised through DHCP)
diff --git a/logcheck/ignore.d.server/nfs-kernel-server b/logcheck/ignore.d.server/nfs-kernel-server
index f77a9ed..70d2179 100644
--- a/logcheck/ignore.d.server/nfs-kernel-server
+++ b/logcheck/ignore.d.server/nfs-kernel-server
@@ -1,2 +1,3 @@
 mountd\[[0-9]+\]: NFS mount of /[^[:space:]]+ attempted from [\.0-9]+$
 mountd\[[0-9]+\]: /[^[:space:]]+ has been mounted by [\.0-9]+$
+rpc\.mountd: authenticated unmount request from [\.0-9]+:[0-9]+ for /[^[:space:]]* \(/[^[:space:]\)]*\) $
diff --git a/logcheck/ignore.d.workstation/local b/logcheck/ignore.d.workstation/local
index 248de07..4a58840 100644
--- a/logcheck/ignore.d.workstation/local
+++ b/logcheck/ignore.d.workstation/local
@@ -75,10 +75,10 @@ dhclient(-2.2.x)?: irda0: unknown hardware address type 783$
 # NB: dhcp3 entries are in dhcp3-common
 dhcpd-2.2.x: Abandoning IP address [\.0-9]+: (declined\.|pinged before offer) $
 dhcpd-2.2.x: BOOTREPLY for [\.0-9]+ to [^[:space:]]+ ([0-9a-f:]+) via eth[0-9]+ $
-dhcpd-2.2.x: BOOTREQUEST from [0-9a-f:]+ $
+dhcpd-2.2.x: BOOTREQUEST from [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCP(ACK|NAK|OFFER) on [\.0-9]+ to [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCPDISCOVER from .* via eth[0-9]+ $
-dhcpd-2.2.x: DHCPINFORM from [\.0-9]+ $
+dhcpd-2.2.x: DHCPINFORM from [\.0-9]+$
 dhcpd-2.2.x: DHCPDECLINE on [\.0-9]+ from [0-9a-f:]+ via eth[0-9]+ $
 dhcpd-2.2.x: DHCPRELEASE of [\.0-9]+ from [0-9a-f:]+ via eth[0-9]+ \((not )?found\) $
 dhcpd-2.2.x: DHCPREQUEST for [\.0-9]+ from [0-9a-f:]+( \([^[:space:]]+\))? via eth[0-9]+ $
@@ -187,6 +187,7 @@ netsaint: NetSaint [\.0-9]+ starting\.\.\. \(PID=[0-9]+\) $
 ### ignore.d.server/nfs-kernel-server
 mountd\[[0-9]+\]: NFS mount of /[^[:space:]]+ attempted from [\.0-9]+$
 mountd\[[0-9]+\]: /[^[:space:]]+ has been mounted by [\.0-9]+$
+rpc\.mountd: authenticated unmount request from [\.0-9]+:[0-9]+ for /[^[:space:]]* \(/[^[:space:]\)]*\) $
 ### ignore.d.server/non-debian
 # These entries are for syslogd open for remote hosts
 # (and advertised through DHCP)
diff --git a/logcheck/violations.ignore.d/local b/logcheck/violations.ignore.d/local
index 142793b..898417f 100644
--- a/logcheck/violations.ignore.d/local
+++ b/logcheck/violations.ignore.d/local
@@ -37,7 +37,7 @@ netsaint: Successfully shutdown\.\.\. \(PID=[0-9]+\) $
 ### violations.ignore.d/pmud
 pmud\[[0-9]+\]: Sleep for this PMU unsupported: will shutdown the machine on sleep request$
 ### violations.ignore.d/postfix
-postfix/(local|smtpd)\[[0-9]+\]: warning: [\.0-9]+: hostname [^[:space:]>]+ verification failed: Host not found(, try again)?$
+postfix/(local|smtpd)\[[0-9]+\]: warning: [\.0-9]+: hostname [^[:space:]]+ verification failed: Host not found(, try again)?$
 postfix/(qmgr|smtp)\[[0-9]+\]: .* status=deferred \(connect to [^[:space:]\[]+\[[\.0-9]+\]: (Connection refused|server refused mail service)\)
 postfix/cleanup\[[0-9]+\]: [A-Z0-9]+: message-id=<[^[:space:]>]+>$
 postfix/local\[[0-9]+\]: warning: unable to create lock file /var/mail/[[:alnum:]]+\.lock: Permission denied$
diff --git a/logcheck/violations.ignore.d/postfix b/logcheck/violations.ignore.d/postfix
index 9de9005..52e940e 100644
--- a/logcheck/violations.ignore.d/postfix
+++ b/logcheck/violations.ignore.d/postfix
@@ -1,4 +1,4 @@
-postfix/(local|smtpd)\[[0-9]+\]: warning: [\.0-9]+: hostname [^[:space:]>]+ verification failed: Host not found(, try again)?$
+postfix/(local|smtpd)\[[0-9]+\]: warning: [\.0-9]+: hostname [^[:space:]]+ verification failed: Host not found(, try again)?$
 postfix/(qmgr|smtp)\[[0-9]+\]: .* status=deferred \(connect to [^[:space:]\[]+\[[\.0-9]+\]: (Connection refused|server refused mail service)\)
 postfix/cleanup\[[0-9]+\]: [A-Z0-9]+: message-id=<[^[:space:]>]+>$
 postfix/local\[[0-9]+\]: warning: unable to create lock file /var/mail/[[:alnum:]]+\.lock: Permission denied$