[Logcheck-commits] Hannes von Haugwitz: ignore.d.workstation/wpasupplicant: allow empty id_str in CTRL-EVENT-CONNECTED message

[Gerfried Fuchs]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Jan 22 11:45:41 2010 +0100

ignore.d.workstation/wpasupplicant: allow empty id_str in CTRL-EVENT-CONNECTED message

---

 debian/changelog                                   |    1 +
 rulefiles/linux/ignore.d.workstation/wpasupplicant |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98094bd..673b13a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ logcheck (1.3.6) UNRELEASED; urgency=low
   * Removed obsolete files in violations.ignore.d/ (closes: #566107)
   * ignore.d.workstation/wpasupplicant:
     - adjusted rule to also match LEAP method
+    - allow empty id_str in CTRL-EVENT-CONNECTED message
   * Added rules for dhcpcd, thanks to Paweł Hajdan, Jr. (closes: #564702)
   * ignore.d.server/nagios:
     - removed rule for nrpe
diff --git a/rulefiles/linux/ignore.d.workstation/wpasupplicant b/rulefiles/linux/ignore.d.workstation/wpasupplicant
index 70261e2..2afb9e9 100644
--- a/rulefiles/linux/ignore.d.workstation/wpasupplicant
+++ b/rulefiles/linux/ignore.d.workstation/wpasupplicant
@@ -2,7 +2,7 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: Associated with ([0-9a-f]{2}:){5}[0-9a-f]{2}$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: WPA: Group rekeying completed with ([0-9a-f]{2}:){5}[0-9a-f]{2} \[GTK=(CCMP|TKIP)\]$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: WPA: Key negotiation completed with ([0-9a-f]{2}:){5}[0-9a-f]{2} \[PTK=(CCMP|TKIP) GTK=(CCMP|TKIP)\]$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: CTRL-EVENT-CONNECTED - Connection to ([0-9a-f]{2}:){5}[0-9a-f]{2} completed \((re)?auth\) \[id=[0-9]+ id_str=[[:alnum:]]+\]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: CTRL-EVENT-CONNECTED - Connection to ([0-9a-f]{2}:){5}[0-9a-f]{2} completed \((re)?auth\) \[id=[0-9]+ id_str=[[:alnum:]]*\]$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: CTRL-EVENT-SCAN-RESULTS$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: CTRL-EVENT-EAP-(STARTED EAP authentication started|SUCCESS EAP authentication completed successfully|METHOD EAP vendor 0 method (17 \(LEAP|25 \(PEAP)\) selected)$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: EAP-MSCHAPV2: Authentication succeeded$