[Logcheck-commits] Hannes von Haugwitz: i.d.w/wpasupplicant: allow '_' in id_str

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Feb 26 22:25:46 2010 +0100

i.d.w/wpasupplicant: allow '_' in id_str

---

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

diff --git a/debian/changelog b/debian/changelog
index 2a65c0f..a7e2fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ logcheck (1.3.8) UNRELEASED; urgency=low
   [ Hannes von Haugwitz ]
   * src/logcheck-test:
     - removed useless trap signal 16
+  * ignore.d.workstation/wpasupplicant:
+    - allow '_' in id_str of CTRL-EVENT-CONNECTED message
 
   [ Gerfried Fuchs ]
   * debian/logcheck.NEWS, debian/logtail.NEWS:
diff --git a/rulefiles/linux/ignore.d.workstation/wpasupplicant b/rulefiles/linux/ignore.d.workstation/wpasupplicant
index 2afb9e9..1f6208e 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$