[Logcheck-commits] Hannes von Haugwitz: ignore.d.server/dhclient: adjusted rules to match optional ip address (closes: #552222)

[Gerfried Fuchs]

Module: logcheck
Branch: lenny-backports
Commit: e6c3e5d72305bdd0d736d74ec2ac267dc6a05b2f
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=e6c3e5d72305bdd0d736d74ec2ac267dc6a05b2f

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Tue Jan 26 21:34:33 2010 +0100

ignore.d.server/dhclient: adjusted rules to match optional ip address (closes: #552222)

---

 debian/changelog                         |    3 +++
 rulefiles/linux/ignore.d.server/dhclient |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c27ebd3..bcd27f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 logcheck (1.3.6) UNRELEASED; urgency=low
 
   [ Hannes von Haugwitz ]
+  * ignore.d.server/dhclient:
+    - adjusted rules to match optional ip address,
+      thanks to David Pashley (closes: #552222)
   * debian/header.txt:
     - fixed incorrect spelling, thanks to Michael Lustfield (closes: #566197)
   * Use mime-construct to send mail (closes: #542781, #564693)
diff --git a/rulefiles/linux/ignore.d.server/dhclient b/rulefiles/linux/ignore.d.server/dhclient
index 2e7c060..ca19a7f 100644
--- a/rulefiles/linux/ignore.d.server/dhclient
+++ b/rulefiles/linux/ignore.d.server/dhclient
@@ -8,8 +8,8 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Listening on [^[:space:].]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Sending on[[:space:]]+[^[:space:]]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCPDISCOVER on [[:alnum:].]+ to [.0-9]{7,15} port 67 interval [0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCP(NAK|ACK|OFFER) from [.0-9]{7,15}$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCP(REQUEST|RELEASE) on [[:alnum:].]+ to [.0-9]{7,15} port 67$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCP(NAK|ACK|OFFER) (of [.0-9]{7,15} )?from [.0-9]{7,15}$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: DHCP(REQUEST|RELEASE) (of [.0-9]{7,15} )?on [[:alnum:].]+ to [.0-9]{7,15} port 67$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: bound(:| to [.0-9]{7,15} --) renewal in [0-9]+ seconds\.$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: [[:lower:]]+[0-9]: unknown hardware address type [0-9]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?: Trying recorded lease [.0-9]{7,15}$