CRM-15934: more host patterns

for responses:
The server is not responding. The server may be down or you may be experiencing network problems.
This mail server requires authentication when attempting to send to a non-local e-mail address
SMTP authentication is required
550 authentication required

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
index 72567618516c3fcf291733aa985fc8209dc011cb..bff4197f91011b2d1a104b89da56ebce3c291dcf 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
@@ -42,3 +42,11 @@ INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
       (@bounceTypeID, 'not permitted to( *550)? relay through this server');
 
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'relay(ing)? (not permitted|(access )?denied)' WHERE `id` = 104;
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Host';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'server requires authentication'),
+      (@bounceTypeID, 'authentication (is )?required');
+
+UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'server is (down or unreachable|not responding)' WHERE `id` = 20;

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index ae18f23a922ef2c200f971edddd991387d41eef2..1b7319ca6fa77b00b522de7f80a38b8bfb213405 100644 (file)
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1191,11 +1191,13 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'isn\'t in my control/locals file'),
     (@bounceTypeID, 'local configuration error'),
     (@bounceTypeID, 'not a gateway'),
-    (@bounceTypeID, 'server is down or unreachable'),
+    (@bounceTypeID, 'server is (down or unreachable|not responding)'),
     (@bounceTypeID, 'too many connections'),
     (@bounceTypeID, 'unable to connect'),
     (@bounceTypeID, 'lost connection'),
-    (@bounceTypeID, 'conversation with [^ ]* timed out while');
+    (@bounceTypeID, 'conversation with [^ ]* timed out while'),
+    (@bounceTypeID, 'server requires authentication'),
+    (@bounceTypeID, 'authentication (is )?required');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)