[Logcheck-commits] Hanspeter Kunz: Revert "i.d.s/dhcp: DHCPREQUESTs/ACKs: host names might contain spaces"

[Hanspeter Kunz]

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

Author: Hanspeter Kunz <hp at edelkunz.ch>
Date:   Mon Jun 21 16:57:01 2010 +0200

Revert "i.d.s/dhcp: DHCPREQUESTs/ACKs: host names might contain spaces"

after discussion with Hannes. See also #568815

This reverts commit fd3c9b361d89838bc23892baf8ce0d5516132f32.

Conflicts:

	debian/changelog

---

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

diff --git a/debian/changelog b/debian/changelog
index 9daaca6..7403815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,10 @@ logcheck (1.3.11) UNRELEASED; urgency=low
 
   [ Hanspeter Kunz ]
   * ignore.d.server/dhcp:
-    - DHCPREQUESTs/ACKs: host names might contain spaces
     - ignore messages about LDAP lookups of host entries
     - ignore messages on sending options to hosts (as a result of LDAP lookups)
   * ignore.d.server/postfix:
-    - ignore another TLS library problem 
+    - ignore another TLS library problem
       (SSL23_GET_CLIENT_HELLO:http request:s23_srvr.c:379)
 
  -- Hanspeter Kunz <hp at edelkunz.ch>  Sun, 20 Jun 2010 22:58:33 +0200
diff --git a/rulefiles/linux/ignore.d.server/dhcp b/rulefiles/linux/ignore.d.server/dhcp
index 9474431..b6dcf41 100644
--- a/rulefiles/linux/ignore.d.server/dhcp
+++ b/rulefiles/linux/ignore.d.server/dhcp
@@ -12,8 +12,8 @@
 #Added for dhcp 3
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPDISCOVER from [:[:alnum:]]+ (\([._[:alnum:]-]+\) |)via [._[:alnum:]-]+(: load balance to peer [._[:alnum:]-]+)?$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPOFFER on [.0-9]{7,15} to [:[:alnum:]]+ (\([._[:alnum:]-]+\) |)via [._[:alnum:]-]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPREQUEST for [.0-9]{7,15} (\([.0-9]{7,15}\) )?from [:[:alnum:]]+ (\([._[:alnum:][:space:]-]+\) )?via [._[:alnum:]-]+(: load balance to peer [._[:alnum:]-]+\.?|: lease owned by peer\.?|: wrong network\.?|: lease [.0-9]{7,15} unavailable\.?)?$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPACK on [.0-9]{7,15} to [:[:alnum:]]+ (\([._[:alnum:][:space:]-]+\) |)via [._[:alnum:]-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPREQUEST for [.0-9]{7,15} (\([.0-9]{7,15}\) |)from [:[:alnum:]]+ (\([._[:alnum:]-]+\) )?via [._[:alnum:]-]+(: load balance to peer [._[:alnum:]-]+\.?|: lease owned by peer\.?|: wrong network\.?|: lease [.0-9]{7,15} unavailable\.?)?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPACK on [.0-9]{7,15} to [:[:alnum:]]+ (\([._[:alnum:]-]+\) |)via [._[:alnum:]-]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPNAK on [.0-9]{7,15} to [:[:alnum:]]+ (\([._[:alnum:]-]+\) |)via [._[:alnum:]-]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPINFORM from [.0-9]{7,15} via [._[:alnum:]-]+$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ dhcpd: DHCPRELEASE of [.0-9]{7,15} from [:[:alnum:]]+ (\([._[:alnum:]-]+\) |)via [._[:alnum:]-]+ \((not |)found\)$