[Logcheck-commits] Jeremy L. Gaddis: i.d.s/dnsmasq: applied changes by Paweł Hajdan , Jr.

[Jeremy L. Gaddis]

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

Author: Jeremy L. Gaddis <jlgaddis at gnu.org>
Date:   Wed Apr  6 18:11:02 2011 -0400

i.d.s/dnsmasq: applied changes by Paweł Hajdan, Jr.

closes: #608574

---

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

diff --git a/debian/changelog b/debian/changelog
index 27e76fb..1b8669a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,10 @@ logcheck (1.3.14) unstable; urgency=low
   * ignore.d.server/postfix:
     - adjust postfix certificate fingerprint rule to match new output
       format, thanks to Loïc Minier (closes: #616616)
+  * ignore.d.server/dnsmasq:
+    - applied changes by Paweł Hajdan, Jr. (closes: #608574):
+      - adjusted rule to match DHCPNAK messages
+      - ignore "Ignoring domain" messages
 
  -- Hannes von Haugwitz <hannes at vonhaugwitz.com>  Thu, 17 Feb 2011 06:43:37 +0100
 
diff --git a/rulefiles/linux/ignore.d.server/dnsmasq b/rulefiles/linux/ignore.d.server/dnsmasq
index e5f0257..51e2c1f 100644
--- a/rulefiles/linux/ignore.d.server/dnsmasq
+++ b/rulefiles/linux/ignore.d.server/dnsmasq
@@ -1,5 +1,6 @@
 ^\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(-dhcp)?\[[[:digit:]]+\]: (DHCPDISCOVER|DHCPOFFER|DHCPREQUEST|DHCPACK|DHCPRELEASE|DHCPINFORM|BOOTP)\([-[:alnum:]]+\) [ :[:alnum:]._-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq(-dhcp)?\[[[:digit:]]+\]: (DHCPDISCOVER|DHCPOFFER|DHCPREQUEST|DHCPACK|DHCPNAK|DHCPRELEASE|DHCPINFORM|BOOTP)\([[:alnum:]]+\) [ :[:alnum:]._-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq(-dhcp)?\[[[:digit:]]+\]: Ignoring domain [._[:alnum:]-]+ for DHCP host name \([._[:alnum:]-]+\)$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dnsmasq\[[[:digit:]]+\]: ignoring nameserver 127\.0\.0\.1 - local interface$