CRM-15934: more relay patterns

for responses:
550 unrouteable address
550 Relay denied for
sorry, relaying denied from your location
Relaying denied. Proper authentication required.
We don't handle mail for
we do not relay
is currently not permitted to
     550 relay through this server
Rejected by next-hop MTA
     on relaying, from MTA(smtp:[127.0.0.1]:10025): 530 5.7.0 Must issue a
     STARTTLS command first (in reply to end of DATA command)

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
index 3bc047265da56f8d53d343c5af3fd937d04af967..72567618516c3fcf291733aa985fc8209dc011cb 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl
@@ -31,3 +31,14 @@ UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'not accepting (mail|mes
 SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Loop';
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail( forwarding)?|routing).loop' WHERE `id` = 81;
 UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'too many (hops|recursive forwards)' WHERE `id` = 86;
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Relay';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'unrouteable address'),
+      (@bounceTypeID, 'We don.t handle mail for'),
+      (@bounceTypeID, 'we do not relay'),
+      (@bounceTypeID, 'Rejected by next-hop'),
+      (@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;

diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index 9ffed67729825335f895c617feed067d7fca1ab7..ae18f23a922ef2c200f971edddd991387d41eef2 100644 (file)
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1325,12 +1325,17 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'cannot find your hostname'),
     (@bounceTypeID, 'ip name lookup'),
     (@bounceTypeID, 'not configured to relay mail'),
-    (@bounceTypeID, 'relay (not permitted|access denied)'),
+    (@bounceTypeID, 'relay(ing)? (not permitted|(access )?denied)'),
     (@bounceTypeID, 'relayed mail to .+? not allowed'),
     (@bounceTypeID, 'sender ip must resolve'),
     (@bounceTypeID, 'unable to relay'),
     (@bounceTypeID, 'No route to host'),
-    (@bounceTypeID, 'Network is unreachable');
+    (@bounceTypeID, 'Network is unreachable'),
+    (@bounceTypeID, 'unrouteable address'),
+    (@bounceTypeID, 'We don.t handle mail for'),
+    (@bounceTypeID, 'we do not relay'),
+    (@bounceTypeID, 'Rejected by next-hop'),
+    (@bounceTypeID, 'not permitted to( *550)? relay through this server');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)