MCSMTPSession: some MS-Exchange SMTP servers reply with permission problem undetectable by mailcore. Catch it and set specific error code instead of common one.

1 files changed, 15 insertions, 10 deletions

diff --git a/src/core/smtp/MCSMTPSession.cpp b/src/core/smtp/MCSMTPSession.cpp
index 179c6c4e..375ef4b6 100644
--- a/src/core/smtp/MCSMTPSession.cpp
+++ b/src/core/smtp/MCSMTPSession.cpp
@@ -672,17 +672,22 @@ void SMTPSession::sendMessage(Address * from, Array * recipients, Data * message
         goto err;
     }
     else if (r != MAILSMTP_NO_ERROR) {
-        if ((responseCode == 550) && (response != NULL) && (response->hasPrefix(MCSTR("5.3.4")))) {
-            * pError = ErrorNeedsConnectToWebmail;
-            goto err;
-        }
-        else {
-            * pError = ErrorSendMessage;
-            MC_SAFE_REPLACE_COPY(String, mLastSMTPResponse, response);
-            mLastLibetpanError = r;
-            mLastSMTPResponseCode = responseCode;
-            goto err;
+        if ((responseCode == 550) && (response != NULL)) {
+            if (response->hasPrefix(MCSTR("5.3.4"))) {
+                * pError = ErrorNeedsConnectToWebmail;
+                goto err;
+            }
+            else if (response->hasPrefix(MCSTR("5.7.1 Client does not have permissions to send as this sender"))) {
+                * pError = ErrorSendMessageNotAllowed;
+                goto err;
+            }
         }
+        
+        * pError = ErrorSendMessage;
+        MC_SAFE_REPLACE_COPY(String, mLastSMTPResponse, response);
+        mLastLibetpanError = r;
+        mLastSMTPResponseCode = responseCode;
+        goto err;
     }
 
     bodyProgress(messageData->length(), messageData->length());