[Logcheck-commits] Hannes von Haugwitz: i.d.w/wpasupplicant: support '/run/sendsigs.omit.d'

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Wed Sep  7 15:28:35 2011 +0200

i.d.w/wpasupplicant: support '/run/sendsigs.omit.d'

closes: #633030

---

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

diff --git a/debian/changelog b/debian/changelog
index 51ab950..9fa8025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ logcheck (1.3.14) unstable; urgency=low
     - allow WPA protocol in 'wpa_action: key_mgmt' message
     - ignore "mode=station" message
     - ignore "Trying to authenticate" message
+    - allow '/run/sendsigs.omit.d' as location for pidfile (closes: #633030)
   * ignore.d.server/login:
     - adjusted rule to match serial terminals
   * ignore.d.workstation/kernel:
diff --git a/rulefiles/linux/ignore.d.workstation/wpasupplicant b/rulefiles/linux/ignore.d.workstation/wpasupplicant
index d877173..952caeb 100644
--- a/rulefiles/linux/ignore.d.workstation/wpasupplicant
+++ b/rulefiles/linux/ignore.d.workstation/wpasupplicant
@@ -12,11 +12,10 @@
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: (WPA_IFACE=wlan[0-9] WPA_ACTION=CONNECTED|WPA_ID=[0-9]+ WPA_ID_STR=[_[:alnum:]]* WPA_CTRL_DIR=/var/run/wpa_supplicant)$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: (pairwise_cipher=(TKIP|CCMP)|group_cipher=(TKIP|CCMP)|key_mgmt=WPA2?(-PSK|/IEEE 802.1X/EAP)|wpa_state=COMPLETED)$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: ifup wlan[0-9]=[_[:alnum:]]*$
-^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: creating sendsigs omission pidfile: /lib/init/rw/sendsigs\.omit\.d/wpasupplicant\.wpa_supplicant\.wlan[0-9]\.pid$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: (creating|removing) sendsigs omission pidfile: /(run|lib/init/rw)/sendsigs\.omit\.d/wpasupplicant\.wpa_supplicant\.wlan[0-9]\.pid$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: (Supplicant PAE state=AUTHENTICATED|suppPortStatus=Authorized|EAP state=SUCCESS|selectedMethod=25 \(EAP-PEAP\)|EAP TLS cipher=DHE-RSA-AES256-SHA|EAP-PEAPv0 Phase2 method=MSCHAPV2)$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: ip_address=(([0-9]|([1-9]|1[0-9]|2[0-4])[0-9]|25[0-5])\.){3}([0-9]|([1-9]|1[0-9]|2[0-4])[0-9]|25[0-5])$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: WPA_IFACE=wlan[0-9] WPA_ACTION=DISCONNECTED$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: mode=station$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: ifdown wlan[0-9]$
-^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_action: removing sendsigs omission pidfile: /lib/init/rw/sendsigs\.omit\.d/wpasupplicant\.wpa_supplicant\.wlan[0-9]\.pid$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]-]+ wpa_supplicant\[[0-9]+\]: CTRL-EVENT-DISCONNECTED - Disconnect event - remove keys$