[Logcheck-commits] Hannes von Haugwitz: i.d.s/dhclient: allow '-' in interface name

[Hannes von Haugwitz]

Module: logcheck
Branch: master
Commit: 3824e06a6c92311a081e7af2381fcc68d7161071
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=3824e06a6c92311a081e7af2381fcc68d7161071

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Sun Apr 17 07:51:06 2011 +0200

i.d.s/dhclient: allow '-' in interface name

closes: #622942

---

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

diff --git a/debian/changelog b/debian/changelog
index 5a38b58..812a0f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ logcheck (1.3.14) unstable; urgency=low
     - use 'logcheck-test' instead of 'logcheck' in the EXAMPLES
   * ignore.d.workstation/libpam-gnome-keyring:
     - adjusted rule to match messages without quotes (closes: #618411)
+  * ignore.d.server/dhclient:
+    - allow '-' in interface name (closes: #622942)
 
   [ Gerfried Fuchs ]
   * Remove myself from uploaders.
diff --git a/rulefiles/linux/ignore.d.server/dhclient b/rulefiles/linux/ignore.d.server/dhclient
index d326115..c7b98e9 100644
--- a/rulefiles/linux/ignore.d.server/dhclient
+++ b/rulefiles/linux/ignore.d.server/dhclient
@@ -7,9 +7,9 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhclient(-2.2.x)?:$
 ^\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)?: 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) (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)?: 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}$