[Logcheck-commits] Hannes von Haugwitz: i.d.s/dnsmasq: match '-dhcp' suffix

[Gerfried Fuchs]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Mon Apr 12 19:33:14 2010 +0200

i.d.s/dnsmasq: match '-dhcp' suffix

---

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

diff --git a/debian/changelog b/debian/changelog
index b935043..5cb2323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ logcheck (1.3.8) UNRELEASED; urgency=low
   * src/logcheck:
     - look for {header,footer}.txt in $RULEDIR, thanks to Kerstin Puschke
     - cd to $STATEDIR before cleaning up temp dir, thanks to Kerstin Puschke
+  * ignore.d.server/dnsmasq:
+    - adjusted rule to also match '-dhcp' suffix in dhcp subsystem messages,
+      thanks to Michał Sawicz
 
   [ Gerfried Fuchs ]
   * debian/logcheck.NEWS, debian/logtail.NEWS:
diff --git a/rulefiles/linux/ignore.d.server/dnsmasq b/rulefiles/linux/ignore.d.server/dnsmasq
index 3746b80..6c87bbc 100644
--- a/rulefiles/linux/ignore.d.server/dnsmasq
+++ b/rulefiles/linux/ignore.d.server/dnsmasq
@@ -1,5 +1,5 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq\[[[:digit:]]+\]: read /etc/hosts - [[:digit:]]+ addresses$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq\[[[:digit:]]+\]: reading (/var/run/dnsmasq/|/etc/)resolv.conf$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq\[[[:digit:]]+\]: using nameserver [.[:digit:]#]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq\[[[:digit:]]+\]: (DHCPDISCOVER|DHCPOFFER|DHCPREQUEST|DHCPACK|DHCPRELEASE|DHCPINFORM|BOOTP)\([[:alnum:]]+\) [ :[:alnum:]._-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq(-dhcp)?\[[[:digit:]]+\]: (DHCPDISCOVER|DHCPOFFER|DHCPREQUEST|DHCPACK|DHCPRELEASE|DHCPINFORM|BOOTP)\([[:alnum:]]+\) [ :[:alnum:]._-]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq\[[[:digit:]]+\]: ignoring nameserver 127\.0\.0\.1 - local interface$