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

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Feb 18 20:33:33 2011 +0100

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

closes: #608256

---

 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 b70d476..2c8b7a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ logcheck (1.3.14) unstable; urgency=low
     - allow optional whitespace between value and unit, thanks to
       Gabor Kiss (closes: #609649)
     - allow optional architecture in "Get" message
+  * ignore.d.server/dnsmasq:
+    - allow '-' in interface name, thanks to Jan Evert van Grootheest
+      (closes: #608256)
 
  -- 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 6c87bbc..e5f0257 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(-dhcp)?\[[[: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$