logcheck: Tweaks to dhcp, sorting the files. Update ChangeLog.

4 files changed, 12 insertions, 12 deletions

diff --git a/logcheck/ignore.d.server/dhcp.changes b/logcheck/ignore.d.server/dhcp.changes
index d452606..69bc5f5 100644
--- a/logcheck/ignore.d.server/dhcp.changes
+++ b/logcheck/ignore.d.server/dhcp.changes
@@ -1,7 +1,7 @@
 # NB: dhcp3 entries are in dhcp3-common
 dhcpd-2.2.x: Abandoning IP address [\.0-9]+: pinged before offer
 dhcpd-2.2.x: BOOTREQUEST from [:0-9a-f]+
-dhcpd-2.2.x: DHCP(ACK|NACK|OFFER) on [\.0-9]+ to [:0-9a-e]+ via eth[0-9]+
+dhcpd-2.2.x: DHCP(ACK|NACK|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: DHCPRELEASE of [\.0-9]+ from [:0-9a-e]+ via eth[0-9]+ \((not )?found\)
+dhcpd-2.2.x: DHCPRELEASE of [\.0-9]+ from [:0-9a-f]+ via eth[0-9]+ \((not )?found\)
 dhcpd-2.2.x: DHCPREQUEST for .* from .* via eth[0-9]+
diff --git a/logcheck/ignore.d.server/dhcp3-common b/logcheck/ignore.d.server/dhcp3-common
index 76744e5..5360ef9 100644
--- a/logcheck/ignore.d.server/dhcp3-common
+++ b/logcheck/ignore.d.server/dhcp3-common
@@ -1,11 +1,11 @@
 dhcpd: Abandoning IP address [\.0-9]+: pinged before offer
 dhcpd: BOOTREQUEST from
-dhcpd: DHCP(ACK|NACN|OFFER) on [\.0-9]+ to [:0-9a-f]+ via eth[0-9]+
+dhcpd: DHCP(ACK|NACN|OFFER) on [\.0-9]+ to [:0-9a-f]+( \([^[:space:]]+\))? via eth[0-9]+
 dhcpd: DHCPACK to [\.0-9]+
 dhcpd: DHCPDISCOVER from [:0-9a-f]+ via eth[0-9]+
 dhcpd: DHCPINFORM from
 dhcpd: DHCPRELEASE of [\.0-9]+
-dhcpd: DHCPREQUEST for [\.0-9]+ from [:0-9a-f]+ via eth[0-9]+
+dhcpd: DHCPREQUEST for [\.0-9]+ from [:0-9a-f]+( \([^[:space:]]+\))? via eth[0-9]+
 dhcpd: ICMP Echo reply while lease [\.0-9]+ valid.
 dhcpd: Wrote [0-9]+ (leases|deleted host decls|new dynamic host decls) to leases file\.
 dhcpd: accepting packet with data after udp payload.
diff --git a/logcheck/ignore.d.server/local b/logcheck/ignore.d.server/local
index 33dc2ff..e938fe8 100644
--- a/logcheck/ignore.d.server/local
+++ b/logcheck/ignore.d.server/local
@@ -60,19 +60,19 @@ 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]+: pinged before offer
 dhcpd-2.2.x: BOOTREQUEST from [:0-9a-f]+
-dhcpd-2.2.x: DHCP(ACK|NACK|OFFER) on [\.0-9]+ to [:0-9a-e]+ via eth[0-9]+
+dhcpd-2.2.x: DHCP(ACK|NACK|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: DHCPRELEASE of [\.0-9]+ from [:0-9a-e]+ via eth[0-9]+ \((not )?found\)
+dhcpd-2.2.x: DHCPRELEASE of [\.0-9]+ from [:0-9a-f]+ via eth[0-9]+ \((not )?found\)
 dhcpd-2.2.x: DHCPREQUEST for .* from .* via eth[0-9]+
 ### ignore.d.server/dhcp3-common
 dhcpd: Abandoning IP address [\.0-9]+: pinged before offer
 dhcpd: BOOTREQUEST from
-dhcpd: DHCP(ACK|NACN|OFFER) on [\.0-9]+ to [:0-9a-f]+ via eth[0-9]+
+dhcpd: DHCP(ACK|NACN|OFFER) on [\.0-9]+ to [:0-9a-f]+( \([^[:space:]]+\))? via eth[0-9]+
 dhcpd: DHCPACK to [\.0-9]+
 dhcpd: DHCPDISCOVER from [:0-9a-f]+ via eth[0-9]+
 dhcpd: DHCPINFORM from
 dhcpd: DHCPRELEASE of [\.0-9]+
-dhcpd: DHCPREQUEST for [\.0-9]+ from [:0-9a-f]+ via eth[0-9]+
+dhcpd: DHCPREQUEST for [\.0-9]+ from [:0-9a-f]+( \([^[:space:]]+\))? via eth[0-9]+
 dhcpd: ICMP Echo reply while lease [\.0-9]+ valid.
 dhcpd: Wrote [0-9]+ (leases|deleted host decls|new dynamic host decls) to leases file\.
 dhcpd: accepting packet with data after udp payload.
diff --git a/logcheck/ignore.d.workstation/local b/logcheck/ignore.d.workstation/local
index f136415..c7a6034 100644
--- a/logcheck/ignore.d.workstation/local
+++ b/logcheck/ignore.d.workstation/local
@@ -60,19 +60,19 @@ 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]+: pinged before offer
 dhcpd-2.2.x: BOOTREQUEST from [:0-9a-f]+
-dhcpd-2.2.x: DHCP(ACK|NACK|OFFER) on [\.0-9]+ to [:0-9a-e]+ via eth[0-9]+
+dhcpd-2.2.x: DHCP(ACK|NACK|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: DHCPRELEASE of [\.0-9]+ from [:0-9a-e]+ via eth[0-9]+ \((not )?found\)
+dhcpd-2.2.x: DHCPRELEASE of [\.0-9]+ from [:0-9a-f]+ via eth[0-9]+ \((not )?found\)
 dhcpd-2.2.x: DHCPREQUEST for .* from .* via eth[0-9]+
 ### ignore.d.server/dhcp3-common
 dhcpd: Abandoning IP address [\.0-9]+: pinged before offer
 dhcpd: BOOTREQUEST from
-dhcpd: DHCP(ACK|NACN|OFFER) on [\.0-9]+ to [:0-9a-f]+ via eth[0-9]+
+dhcpd: DHCP(ACK|NACN|OFFER) on [\.0-9]+ to [:0-9a-f]+( \([^[:space:]]+\))? via eth[0-9]+
 dhcpd: DHCPACK to [\.0-9]+
 dhcpd: DHCPDISCOVER from [:0-9a-f]+ via eth[0-9]+
 dhcpd: DHCPINFORM from
 dhcpd: DHCPRELEASE of [\.0-9]+
-dhcpd: DHCPREQUEST for [\.0-9]+ from [:0-9a-f]+ via eth[0-9]+
+dhcpd: DHCPREQUEST for [\.0-9]+ from [:0-9a-f]+( \([^[:space:]]+\))? via eth[0-9]+
 dhcpd: ICMP Echo reply while lease [\.0-9]+ valid.
 dhcpd: Wrote [0-9]+ (leases|deleted host decls|new dynamic host decls) to leases file\.
 dhcpd: accepting packet with data after udp payload.