[Logcheck-commits] Hannes von Haugwitz: Revert "i.d.s/dnsmasq: =?UTF-8?Q?=20applied=20changes=20by=20P?==?UTF-8?Q?awe=C5=82=20Hajdan?=, Jr ."

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Sep  2 07:40:26 2011 +0200

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

This reverts commit d4a97c5555b8de835ffe123c86d79ba08af147fc.

---

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

diff --git a/debian/changelog b/debian/changelog
index 0af587c..700cf5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,10 +67,6 @@ 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
   * ignore.d.server/amavisd-new:
     - adjusted rule to match new output format, thanks to Adrian Lang
       (closes: #624197)
diff --git a/rulefiles/linux/ignore.d.server/dnsmasq b/rulefiles/linux/ignore.d.server/dnsmasq
index 51e2c1f..e5f0257 100644
--- a/rulefiles/linux/ignore.d.server/dnsmasq
+++ b/rulefiles/linux/ignore.d.server/dnsmasq
@@ -1,6 +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(-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(-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$