From b5639a8672b3ace9c3e761d05fc76b50c29d3b17 Mon Sep 17 00:00:00 2001
From: Steven Hiscocks <steven@hiscocks.me.uk>
Date: Fri, 26 Jul 2013 11:55:09 +0100
Subject: [PATCH] ENH: Simplify cyrus-imap filter fail regex

---
 config/filter.d/cyrus-imap.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/filter.d/cyrus-imap.conf b/config/filter.d/cyrus-imap.conf
index b63fad8f..0ace92c1 100644
--- a/config/filter.d/cyrus-imap.conf
+++ b/config/filter.d/cyrus-imap.conf
@@ -22,8 +22,7 @@ _daemon = (?:cyrus/)?(?:imapd?|pop3d?)
 #          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
 # Values:  TEXT
 #
-failregex = ^%(__prefix_line)sbadlogin: \S+ ?\[<HOST>\] (?:plaintext|PLAIN|LOGIN) .* \[?SASL\(-13\): authentication failure: checkpass failed\]?$
-	    ^%(__prefix_line)sbadlogin: \S+ ?\[<HOST>\] (?:(?:CRAM|DIGEST)-MD5|NTLM|OTP) \[SASL\(-13\): authentication failure: .*\]$
+failregex = ^%(__prefix_line)sbadlogin: \S+ ?\[<HOST>\] \S+ .*?\[?SASL\(-13\): authentication failure: .*\]?$
 
 # Option:  ignoreregex
 # Notes.:  regex to ignore. If this regex matches, the line is ignored.